icinga2 0.9.0.1 → 0.9.2.1

data/lib/icinga2/notifications.rb

@@ -17,8 +17,10 @@ module Icinga2
     #
     def enable_host_notification( host )
 
-      raise ArgumentError.new('only String are allowed') unless( host.is_a?(String) )
-      raise ArgumentError.new('missing host') if( host.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'host\' must be an String, given \'%s\'', host.class.to_s)) unless( host.is_a?(String) )
+      raise ArgumentError.new('missing \'host\'') if( host.size.zero? )
+
+      return { 'code' => 404, 'status' => 'Object not Found' } if( exists_host?( host ) == false )
 
       host_notification( name: host, enable_notifications: true )
     end
@@ -34,8 +36,10 @@ module Icinga2
     #
     def disable_host_notification( host )
 
-      raise ArgumentError.new('only String are allowed') unless( host.is_a?(String) )
-      raise ArgumentError.new('missing host') if( host.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'host\' must be an String, given \'%s\'', host.class.to_s)) unless( host.is_a?(String) )
+      raise ArgumentError.new('missing \'host\'') if( host.size.zero? )
+
+      return { 'code' => 404, 'status' => 'Object not Found' } if( exists_host?( host ) == false )
 
       host_notification( name: host, enable_notifications: false )
     end
@@ -51,8 +55,10 @@ module Icinga2
     #
     def enable_service_notification( host )
 
-      raise ArgumentError.new('only String are allowed') unless( host.is_a?(String) )
-      raise ArgumentError.new('missing host') if( host.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'host\' must be an String, given \'%s\'', host.class.to_s)) unless( host.is_a?(String) )
+      raise ArgumentError.new('missing \'host\'') if( host.size.zero? )
+
+      return { 'code' => 404, 'status' => 'Object not Found' } if( exists_host?( host ) == false )
 
       service_notification( name: host, enable_notifications: true )
     end
@@ -68,8 +74,10 @@ module Icinga2
     #
     def disable_service_notification( host )
 
-      raise ArgumentError.new('only String are allowed') unless( host.is_a?(String) )
-      raise ArgumentError.new('missing host') if( host.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'host\' must be an String, given \'%s\'', host.class.to_s)) unless( host.is_a?(String) )
+      raise ArgumentError.new('missing \'host\'') if( host.size.zero? )
+
+      return { 'code' => 404, 'status' => 'Object not Found' } if( exists_host?( host ) == false )
 
       service_notification( name: host, enable_notifications: false )
     end
@@ -87,16 +95,15 @@ module Icinga2
     #
     def enable_hostgroup_notification( params )
 
-      raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
-      raise ArgumentError.new('missing params') if( params.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
 
-      host       = params.dig(:host)
       host_group = params.dig(:host_group)
-
-      raise ArgumentError.new('Missing host') if( host.nil? )
       raise ArgumentError.new('Missing host_group') if( host_group.nil? )
 
-      hostgroup_notification( host: host, host_group: host_group, enable_notifications: true )
+      return { 'code' => 404, 'status' => 'Object not Found' } if( exists_hostgroup?( host_group ) == false )
+
+      hostgroup_notification( host_group: host_group, enable_notifications: true )
     end
 
     # disable hostgroup notifications
@@ -112,16 +119,15 @@ module Icinga2
     #
     def disable_hostgroup_notification( params )
 
-      raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
-      raise ArgumentError.new('missing params') if( params.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
 
-      host       = params.dig(:host)
       host_group = params.dig(:host_group)
-
-      raise ArgumentError.new('Missing host') if( host.nil? )
       raise ArgumentError.new('Missing host_group') if( host_group.nil? )
 
-      hostgroup_notification( host: host, host_group: host_group, enable_notifications: false )
+      return { 'code' => 404, 'status' => 'Object not Found' } if( exists_hostgroup?( host_group ) == false )
+
+      hostgroup_notification( host_group: host_group, enable_notifications: true )
     end
 
     # return all notifications
@@ -131,15 +137,11 @@ module Icinga2
     #
     def notifications
 
-      data = Network.api_data(
+      api_data(
         url: format( '%s/objects/notifications', @icinga_api_url_base ),
         headers: @headers,
         options: @options
       )
-
-      return data.dig('results') if( data.dig(:status).nil? )
-
-      nil
     end
 
     protected
@@ -163,7 +165,7 @@ module Icinga2
         }
       }
 
-      Network.post(
+      post(
         url: format( '%s/objects/hosts/%s', @icinga_api_url_base, name ),
         headers: @headers,
         options: @options,
@@ -192,7 +194,7 @@ module Icinga2
         }
       }
 
-      Network.post(
+      post(
         url: format( '%s/objects/services', @icinga_api_url_base ),
         headers: @headers,
         options: @options,
@@ -221,7 +223,7 @@ module Icinga2
         }
       }
 
-      Network.post(
+      post(
         url: format( '%s/objects/services', @icinga_api_url_base ),
         headers: @headers,
         options: @options,

data/lib/icinga2/servicegroups.rb

@@ -11,6 +11,9 @@ module Icinga2
     # @param [Hash] params
     # @option params [String] :service_group servicegroup to create
     # @option params [String] :display_name the displayed name
+    # @option params [String] :notes
+    # @option params [String] :notes_url
+    # @option params [String] :action_url
     #
     # @example
     #   @icinga.add_servicegroup(service_group: 'foo', display_name: 'FOO')
@@ -19,18 +22,38 @@ module Icinga2
     #
     def add_servicegroup( params )
 
-      raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
-      raise ArgumentError.new('missing params') if( params.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
 
       service_group = params.dig(:service_group)
-      display_name = params.dig(:display_name)
-
-      raise ArgumentError.new('Missing service_group') if( service_group.nil? )
-      raise ArgumentError.new('Missing display_name') if( display_name.nil? )
-
-      payload = { 'attrs' => { 'display_name' => display_name } }
-
-      Network.put(
+      display_name  = params.dig(:display_name)
+      notes         = params.dig(:notes)
+      notes_url     = params.dig(:notes_url)
+      action_url    = params.dig(:action_url)
+
+#      ignore = params.dig(:ignore)
+#      assgin = params.dig(:assign)
+
+      raise ArgumentError.new('Missing \'service_group\'') if( service_group.nil? )
+      raise ArgumentError.new('Missing \'display_name\'') if( display_name.nil? )
+
+      payload = {
+        'attrs' => {
+          'display_name' => display_name,
+          'notes' => notes,
+          'notes_url' => notes_url,
+          'action_url' => action_url
+        }
+      }
+
+#      payload['attrs']['assign'] ||= format('assgin where %s', assign) unless(assign.nil?)
+#      payload['attrs']['ignore'] ||= format('ignore where %s', assign) unless(assign.nil?)
+
+      # remove all empty attrs
+      payload.reject!{ |_k, v| v.nil? }
+      payload['attrs'].reject!{ |_k, v| v.nil? }
+
+      put(
         url: format( '%s/objects/servicegroups/%s', @icinga_api_url_base, service_group ),
         headers: @headers,
         options: @options,
@@ -50,14 +73,14 @@ module Icinga2
     #
     def delete_servicegroup( params )
 
-      raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
-      raise ArgumentError.new('missing params') if( params.size.zero? )
+      raise ArgumentError.new(format('wrong type. \'params\' must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing \'params\'') if( params.size.zero? )
 
       service_group = params.dig(:service_group)
 
-      raise ArgumentError.new('Missing service_group') if( service_group.nil? )
+      raise ArgumentError.new('Missing \'service_group\'') if( service_group.nil? )
 
-      Network.delete(
+      delete(
         url: format( '%s/objects/servicegroups/%s?cascade=1', @icinga_api_url_base, service_group ),
         headers: @headers,
         options: @options
@@ -88,15 +111,11 @@ module Icinga2
         format( '%s/objects/servicegroups/%s', @icinga_api_url_base, service_group )
       end
 
-      data = Network.api_data(
+      api_data(
         url: url,
         headers: @headers,
         options: @options
       )
-
-      return data.dig('results') if( data.dig(:status).nil? )
-
-      nil
     end
 
     # checks if the servicegroup exists
@@ -110,16 +129,16 @@ module Icinga2
     #
     def exists_servicegroup?( service_group )
 
-      raise ArgumentError.new('only String are allowed') unless( service_group.is_a?(String) )
-      raise ArgumentError.new('Missing service_group') if( service_group.size.zero? )
-
+      raise ArgumentError.new(format('wrong type. \'service_group\' must be an String, given \'%s\'', service_group.class.to_s)) unless( service_group.is_a?(String) )
+      raise ArgumentError.new('Missing \'service_group\'') if( service_group.size.zero? )
 
       result = servicegroups( service_group: service_group )
       result = JSON.parse( result ) if  result.is_a?( String )
+      result = result.first if( result.is_a?(Array) )
 
-      return true if  !result.nil? && result.is_a?(Array)
+      return false if( result.is_a?(Hash) && result.dig('code') == 404 )
 
-      false
+      true
     end
 
   end

data/lib/icinga2/services.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 module Icinga2
@@ -6,29 +5,25 @@ module Icinga2
   # namespace for service handling
   module Services
 
-    # add services
+    # add service
     #
     # @param [Hash] params
-    # @option params [String] :host
-    # @option params [String] :service_name
+    # @option params [String] :name
+    # @option params [String] :host_name
     # @option params [Array] :templates
     # @option params [Hash] :vars
     #
     # @example
-    #    @icinga.add_services(
-    #      host: 'icinga2',
-    #      service_name: 'http2',
+    #    @icinga.add_service(
+    #      name: 'http2',
+    #      host_name: 'icinga2',
+    #      check_command: 'http',
+    #      check_interval: 10,
+    #      retry_interval: 30,
     #      vars: {
-    #        attrs: {
-    #          check_command: 'http',
-    #          check_interval: 10,
-    #          retry_interval: 30,
-    #          vars: {
-    #            http_address: '127.0.0.1',
-    #            http_url: '/access/index',
-    #            http_port: 80
-    #          }
-    #        }
+    #        http_address: '127.0.0.1',
+    #        http_url: '/access/index',
+    #        http_port: 80
     #      }
     #    )
     #
@@ -36,63 +31,141 @@ module Icinga2
     #    * status
     #    * message
     #
-    def add_services( params = {} )
-
-      raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
+    def add_service( params = {} )
 
-      host_name    = params.dig(:host)
-      service_name = params.dig(:service_name)
-      templates    = params.dig(:templates) || ['generic-service']
-      vars         = params.dig(:vars)
-
-      raise ArgumentError.new('Missing host') if( host_name.nil? )
-      raise ArgumentError.new('Missing service_name') if( service_name.nil? )
-      raise ArgumentError.new('only Array for templates are allowed') unless( templates.is_a?(Array) )
-      raise ArgumentError.new('Missing vars') if( vars.nil? )
-      raise ArgumentError.new('only Hash for vars are allowed') unless( vars.is_a?(Hash) )
+      raise ArgumentError.new(format('wrong type. params must be an Hash, given \'%s\'', params.class.to_s)) unless( params.is_a?(Hash) )
+      raise ArgumentError.new('missing params') if( params.size.zero? )
 
-      # validate
-      # needed_values = %w[check_command check_interval retry_interval]
+      name = params.dig(:name)
+      host_name = params.dig(:host_name)
+      display_name = params.dig(:display_name)
+      groups = params.dig(:groups)
+      check_command = params.dig(:check_command)
+      max_check_attempts = params.dig(:max_check_attempts)
+      check_period = params.dig(:check_period)
+      check_timeout = params.dig(:check_timeout)
+      check_interval = params.dig(:check_interval)
+      retry_interval = params.dig(:retry_interval)
+      enable_notifications = params.dig(:enable_notifications)
+      enable_active_checks = params.dig(:enable_active_checks)
+      enable_passive_checks = params.dig(:enable_passive_checks)
+      enable_event_handler = params.dig(:enable_event_handler)
+      enable_flapping = params.dig(:enable_flapping)
+      flapping_threshold = params.dig(:flapping_threshold)
+      enable_perfdata = params.dig(:enable_perfdata)
+      event_command = params.dig(:event_command)
+      volatile = params.dig(:volatile)
+      zone = params.dig(:zone)
+      command_endpoint = params.dig(:command_endpoint)
+      notes = params.dig(:notes)
+      notes_url = params.dig(:notes_url)
+      action_url = params.dig(:action_url)
+      icon_image = params.dig(:icon_image)
+      icon_image_alt = params.dig(:icon_image_alt)
+      templates = params.dig(:templates) || ['generic-service']
+      vars = params.dig(:vars) || {}
+
+      raise ArgumentError.new('missing name') if( name.nil? )
+
+      %w[display_name
+         host_name
+         check_command
+         check_period
+         event_command
+         zone
+         name
+         command_endpoint
+         notes
+         notes_url
+         action_url
+         icon_image
+         icon_image_alt
+         ].each do |attr|
+          v = eval(attr)
+        raise ArgumentError.new(format('wrong type. \'%s\' must be an String, given \'%s\'', attr, v.class.to_s)) unless( v.is_a?(String) || v.nil? )
+      end
 
-      attrs = vars.dig(:attrs)
+      %w[max_check_attempts
+         flapping_threshold
+         check_timeout
+         check_interval
+         retry_interval].each do |attr|
+          v = eval(attr)
+        raise ArgumentError.new(format('wrong type. \'%s\' must be an Integer, given \'%s\'', attr, v.class.to_s)) unless( v.is_a?(Integer) || v.nil? )
+      end
 
-      validate_check_command  = attrs.select { |k,_v| k == 'check_command'.to_sym }.size
-      validate_check_interval = attrs.select { |k,_v| k == 'check_interval'.to_sym }.size
-      validate_retry_interval = attrs.select { |k,_v| k == 'retry_interval'.to_sym }.size
+      %w[enable_notifications
+         enable_active_checks
+         enable_passive_checks
+         enable_event_handler
+         enable_flapping
+         enable_perfdata
+         volatile].each do |attr|
+          v = eval(attr)
+          raise ArgumentError.new(format('wrong type. \'%s\' must be True or False, given \'%s\'', attr, v.class.to_s)) unless( v.is_a?(TrueClass) || v.is_a?(FalseClass) || v.nil? )
+      end
 
-      raise 'Error in attrs, expected \'check_command\' but was not found' if( validate_check_command.zero? )
-      raise 'Error in attrs, expected \'check_interval\' but was not found' if( validate_check_interval.zero? )
-      raise 'Error in attrs, expected \'retry_interval\' but was not found' if( validate_retry_interval.zero? )
+      %w[groups templates].each do |attr|
+          v = eval(attr)
+          raise ArgumentError.new(format('wrong type. \'%s\' must be an Array, given \'%s\'', attr, v.class.to_s)) unless( v.is_a?(Array) || v.nil? )
+      end
 
-      payload = ''
+      raise ArgumentError.new(format('wrong type. \'vars\' must be an Hash, given \'%s\'', v.class.to_s)) unless( vars.is_a?(Hash) )
+
+      payload = {
+        'templates' => templates,
+        'attrs' => {
+          'display_name' => display_name,
+          'groups' => groups,
+          'check_command' => check_command,
+          'max_check_attempts' => max_check_attempts,
+          'check_period' => check_period,
+          'check_timeout' => check_timeout,
+          'check_interval' => check_interval,
+          'retry_interval' => retry_interval,
+          'enable_notifications' => enable_notifications,
+          'enable_active_checks' => enable_active_checks,
+          'enable_passive_checks' => enable_passive_checks,
+          'enable_event_handler' => enable_event_handler,
+          'enable_flapping' => enable_flapping,
+          'flapping_threshold' => flapping_threshold,
+          'zone' => zone,
+          'enable_perfdata' => enable_perfdata,
+          'event_command' => event_command,
+          'volatile' => volatile,
+          'command_endpoint' => command_endpoint,
+          'notes' => notes,
+          'notes_url' => notes_url,
+          'action_url' => action_url,
+          'icon_image' => icon_image,
+          'icon_image_alt' => icon_image_alt,
+        }
+      }
 
-      vars.each do |_s,v|
+      payload['attrs']['vars'] = vars unless vars.empty?
 
-        payload = {
-          'templates' => templates,
-          'attrs'     => update_host( v, host_name )
-        }
-      end
+      # clear undefined settings
+      payload.reject!{ |_k, v| v.nil? }
+      payload['attrs'].reject!{ |_k, v| v.nil? }
 
-      Network.put(
-        url: format( '%s/objects/services/%s!%s', @icinga_api_url_base, host_name, service_name ),
+      put(
+        url: format( '%s/objects/services/%s!%s', @icinga_api_url_base, host_name, name ),
         headers: @headers,
         options: @options,
         payload: payload
       )
-
     end
 
     # delete a service
     #
     # @param [Hash] params
-    # @option params [String] :host host name for the service
-    # @option params [String] :service_name
+    # @option params [String] :host_name host name for the service
+    # @option params [String] :name
     # @option params [Bool] :cascade (false) delete service also when other objects depend on it
     #
     # @example
-    #   @icinga.delete_service(host: 'foo', service_name: 'http2')
-    #   @icinga.delete_service(host: 'foo', service_name: 'http2', cascade: true)
+    #   @icinga.delete_service(host_name: 'foo', name: 'http2')
+    #   @icinga.delete_service(host_name: 'foo', name: 'http2', cascade: true)
     #
     # @return [Hash] result
     #
@@ -101,20 +174,20 @@ module Icinga2
       raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
       raise ArgumentError.new('missing params') if( params.size.zero? )
 
-      host_name    = params.dig(:host)
-      service_name = params.dig(:service_name)
+      host_name    = params.dig(:host_name)
+      name = params.dig(:name)
       cascade      = params.dig(:cascade)
 
       raise ArgumentError.new('Missing host') if( host_name.nil? )
-      raise ArgumentError.new('Missing service_name') if( service_name.nil? )
+      raise ArgumentError.new('Missing service name') if( name.nil? )
 
       if( ! cascade.nil? && ( ! cascade.is_a?(TrueClass) && ! cascade.is_a?(FalseClass) ) )
         raise ArgumentError.new('cascade can only be true or false')
       end
 
-      url = format( '%s/objects/services/%s!%s%s', @icinga_api_url_base, host_name, service_name, cascade.is_a?(TrueClass) ? '?cascade=1' : nil )
+      url = format( '%s/objects/services/%s!%s%s', @icinga_api_url_base, host_name, name, cascade.is_a?(TrueClass) ? '?cascade=1' : nil )
 
-      Network.delete(
+      delete(
         url: url,
         headers: @headers,
         options: @options
@@ -125,12 +198,13 @@ module Icinga2
     # modify an service
     #
     # @param [Hash] params
-    # @option params [String] :service_name
+    # @option params [String] :name
+    # @option params [Array] :templates
     # @option params [Hash] :vars
     #
     # @example
     #    @icinga.modify_service(
-    #      service_name: 'http2',
+    #      name: 'http2',
     #      vars: {
     #        attrs: {
     #          check_interval: 60,
@@ -154,16 +228,16 @@ module Icinga2
 
       templates     = params.dig(:templates) || ['generic-service']
       vars          = params.dig(:vars)
-      service_name  = params.dig(:service_name)
+      name  = params.dig(:name)
 
-      raise ArgumentError.new('Missing service_name') if( service_name.nil? )
+      raise ArgumentError.new('Missing service name') if( name.nil? )
       raise ArgumentError.new('only Array for templates are allowed') unless( templates.is_a?(Array) )
       raise ArgumentError.new('Missing vars') if( vars.nil? )
       raise ArgumentError.new('only Hash for vars are allowed') unless( vars.is_a?(Hash) )
 
       payload = {}
 
-      vars.each do |_s,v|
+      vars.each_value do |v|
 
         payload = {
           'templates' => templates,
@@ -171,9 +245,9 @@ module Icinga2
         }
       end
 
-      payload['filter'] = format( 'service.name=="%s"', service_name )
+      payload['filter'] = format( 'service.name=="%s"', name )
 
-      Network.post(
+      post(
         url: format( '%s/objects/services', @icinga_api_url_base ),
         headers: @headers,
         options: @options,
@@ -198,29 +272,25 @@ module Icinga2
       payload['attrs']  = attrs unless  attrs.nil?
       payload['filter'] = filter unless filter.nil?
 
-      data = Network.api_data(
+      api_data(
         url: format( '%s/objects/services', @icinga_api_url_base ),
         headers: @headers,
         options: @options,
         payload: payload
       )
-
-      status  = data.dig(:status)
-
-      data.dig('results') if( status.nil? )
     end
 
     # return services
     #
     # @param [Hash] params
-    # @option params [String] :host
-    # @option params [String] :service
+    # @option params [String] :host_name
+    # @option params [String] :name
     #
     # @example to get all services
     #    @icinga.services
     #
     # @example to get one service for host
-    #    @icinga.services( host: 'icinga2', service: 'ping4' )
+    #    @icinga.services( host_name: 'icinga2', name: 'ping4' )
     #
     # @return [Hash]
     #
@@ -228,35 +298,31 @@ module Icinga2
 
       raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
 
-      host_name = params.dig(:host)
-      service   = params.dig(:service)
+      host_name = params.dig(:host_name)
+      name   = params.dig(:name)
 
       url =
-      if( service.nil? )
+      if( name.nil? )
         format( '%s/objects/services/%s', @icinga_api_url_base, host_name )
       else
-        format( '%s/objects/services/%s!%s', @icinga_api_url_base, host_name, service )
+        format( '%s/objects/services/%s!%s', @icinga_api_url_base, host_name, name )
       end
 
-      data = Network.api_data(
+      api_data(
         url: url,
         headers: @headers,
         options: @options
       )
-
-      return data.dig('results') if( data.dig(:status).nil? )
-
-      nil
     end
 
     # returns true if the service exists
     #
     # @param [Hash] params
-    # @option params [String] :host
-    # @option params [String] :service
+    # @option params [String] :host_name
+    # @option params [String] :name
     #
     # @example
-    #    @icinga.exists_service?(host: 'icinga2', service: 'users')
+    #    @icinga.exists_service?(host_name: 'icinga2', name: 'users')
     #
     # @return [Bool]
     #
@@ -265,18 +331,19 @@ module Icinga2
       raise ArgumentError.new('only Hash are allowed') unless( params.is_a?(Hash) )
       raise ArgumentError.new('missing params') if( params.size.zero? )
 
-      host    = params.dig(:host)
-      service = params.dig(:service)
+      host    = params.dig(:host_name)
+      service = params.dig(:name)
 
       raise ArgumentError.new('Missing host') if( host.nil? )
       raise ArgumentError.new('Missing service') if( service.nil? )
 
-      result = services( host: host, service: service )
+      result = services( host_name: host, name: service )
       result = JSON.parse( result ) if  result.is_a?( String )
+      result = result.first if( result.is_a?(Array) )
 
-      return true if  !result.nil? && result.is_a?(Array)
+      return false if( result.is_a?(Hash) && result.dig('code') == 404 )
 
-      false
+      true
     end
 
     # returns service objects
@@ -313,42 +380,32 @@ module Icinga2
       payload['filter'] = filter unless filter.nil?
       payload['joins']  = joins unless  joins.nil?
 
-      data = Network.api_data(
+      data = api_data(
         url: format( '%s/objects/services', @icinga_api_url_base ),
         headers: @headers,
         options: @options,
         payload: payload
       )
 
-      status  = data.dig(:status)
-
-      if( status.nil? )
-
-        results = data.dig('results')
+      @last_service_objects_called = Time.now.to_i
 
-        unless( results.nil? )
-
-          all_services = results.clone
-
-          unless( all_services.nil? )
-
-            @services_all              = all_services.size
-            @services_problems         = count_problems(results)
-            @services_handled_warning  = count_problems(results, Icinga2::SERVICE_STATE_WARNING)
-            @services_handled_critical = count_problems(results, Icinga2::SERVICE_STATE_CRITICAL)
-            @services_handled_unknown  = count_problems(results, Icinga2::SERVICE_STATE_UNKNOWN)
-          end
+      if( !data.nil? && data.is_a?(Array) )
+        all_services = data.clone
+        unless( all_services.nil? )
+          @services_all              = all_services.size
+          @services_problems         = count_problems(all_services)
+          @services_handled_warning  = count_problems(all_services, Icinga2::SERVICE_STATE_WARNING)
+          @services_handled_critical = count_problems(all_services, Icinga2::SERVICE_STATE_CRITICAL)
+          @services_handled_unknown  = count_problems(all_services, Icinga2::SERVICE_STATE_UNKNOWN)
         end
       end
 
-      results
+      data
     end
 
     # returns adjusted service state
     #
     # @example
-    #    @icinga.cib_data
-    #    @icinga.service_objects
     #    warning, critical, unknown = @icinga.services_adjusted.values
     #
     #    s = @icinga.services_adjusted
@@ -361,6 +418,12 @@ module Icinga2
     #
     def services_adjusted
 
+      puts 'function services_adjusted is obsolete'
+      puts 'Please use service_problems()'
+
+      cib_data if((Time.now.to_i - @last_cib_data_called).to_i > @last_call_timeout)
+      service_objects if((Time.now.to_i - @last_service_objects_called).to_i > @last_call_timeout)
+
       service_warning          = @services_warning.nil?          ? 0 : @services_warning
       service_critical         = @services_critical.nil?         ? 0 : @services_critical
       service_unknown          = @services_unknown.nil?          ? 0 : @services_unknown
@@ -392,6 +455,8 @@ module Icinga2
       service_data = service_objects
       service_data = JSON.parse(service_data) if service_data.is_a?(String)
 
+      return 0 if( service_data.nil? )
+
       f = service_data.select { |t| t.dig('attrs','state') != 0 && t.dig('attrs','downtime_depth').zero? && t.dig('attrs','acknowledgement').zero? }
 
       f.size
@@ -422,7 +487,7 @@ module Icinga2
 
       unless( services_data.nil? )
 
-        services_data.each do |s,_v|
+        services_data.each do |s|
 
           name  = s.dig('name')
           state = s.dig('attrs','state')
@@ -433,7 +498,7 @@ module Icinga2
 
         if( services_with_problems.count != 0 )
           services_with_problems.sort.reverse!
-          services_with_problems = services_with_problems.keys[1..max_items].each { |k,_v| services_with_problems_and_severity[k] = services_with_problems[k] }
+          services_with_problems = services_with_problems.keys[1..max_items].each { |k| services_with_problems_and_severity[k] = services_with_problems[k] }
         end
       end
 
@@ -446,21 +511,22 @@ module Icinga2
     # returns a counter of all services
     #
     # @example
-    #    @icinga.cib_data
-    #    @icinga.service_objects
     #    @icinga.services_all
     #
     # @return [Integer]
     #
     def services_all
+
+      cib_data if((Time.now.to_i - @last_cib_data_called).to_i > @last_call_timeout)
+      service_objects if((Time.now.to_i - @last_service_objects_called).to_i > @last_call_timeout)
+
       @services_all
     end
 
     # returns data with service problems
     #
     # @example
-    #    @icinga.cib_data
-    #    all, warning, critical, unknown, pending, in_downtime, acknowledged = @icinga.service_problems.values
+    #    all, warning, critical, unknown, pending, in_downtime, acknowledged, adjusted_warning, adjusted_critical, adjusted_unknown = @icinga.service_problems.values
     #
     #    p = @icinga.service_problems
     #    warning = p.dig(:warning)
@@ -476,13 +542,25 @@ module Icinga2
     #
     def service_problems
 
-      services_ok           = @services_ok.nil?           ? 0 : @services_ok
-      services_warning      = @services_warning.nil?      ? 0 : @services_warning
-      services_critical     = @services_critical.nil?     ? 0 : @services_critical
-      services_unknown      = @services_unknown.nil?      ? 0 : @services_unknown
-      services_pending      = @services_pending.nil?      ? 0 : @services_pending
-      services_in_downtime  = @services_in_downtime.nil?  ? 0 : @services_in_downtime
-      services_acknowledged = @services_acknowledged.nil? ? 0 : @services_acknowledged
+      cib_data if((Time.now.to_i - @last_cib_data_called).to_i > @last_call_timeout)
+      service_objects if((Time.now.to_i - @last_service_objects_called).to_i > @last_call_timeout)
+
+      services_ok               = @services_ok.nil?               ? 0 : @services_ok
+      services_warning          = @services_warning.nil?          ? 0 : @services_warning
+      services_critical         = @services_critical.nil?         ? 0 : @services_critical
+      services_unknown          = @services_unknown.nil?          ? 0 : @services_unknown
+      services_pending          = @services_pending.nil?          ? 0 : @services_pending
+      services_in_downtime      = @services_in_downtime.nil?      ? 0 : @services_in_downtime
+      services_acknowledged     = @services_acknowledged.nil?     ? 0 : @services_acknowledged
+      services_handled_all      = @services_handled.nil?          ? 0 : @services_handled
+      services_handled_warning  = @services_handled_warning.nil?  ? 0 : @services_handled_warning
+      services_handled_critical = @services_handled_critical.nil? ? 0 : @services_handled_critical
+      services_handled_unknown  = @services_handled_unknown.nil?  ? 0 : @services_handled_unknown
+
+      # calculate service problems adjusted by handled problems
+      services_adjusted_warning  = services_warning  - services_handled_warning
+      services_adjusted_critical = services_critical - services_handled_critical
+      services_adjusted_unknown  = services_unknown  - services_handled_unknown
 
       {
         ok: services_ok.to_i,
@@ -491,14 +569,20 @@ module Icinga2
         unknown: services_unknown.to_i,
         pending: services_pending.to_i,
         in_downtime: services_in_downtime.to_i,
-        acknowledged: services_acknowledged.to_i
+        acknowledged: services_acknowledged.to_i,
+        adjusted_warning: services_adjusted_warning.to_i,
+        adjusted_critical: services_adjusted_critical.to_i,
+        adjusted_unknown: services_adjusted_unknown.to_i,
+        handled_all: services_handled_all.to_i,
+        handled_warning: services_handled_warning.to_i,
+        handled_critical: services_handled_critical.to_i,
+        handled_unknown: services_handled_unknown.to_i
       }
     end
 
     # returns data with service problems they be handled (acknowledged or in downtime)
     #
     # @example
-    #    @icinga.cib_data
     #    @icinga.service_objects
     #    all, warning, critical, unknown = @icinga.service_problems_handled.values
     #
@@ -513,6 +597,11 @@ module Icinga2
     #
     def service_problems_handled
 
+      puts 'function service_problems_handled is obsolete'
+      puts 'Please use service_problems()'
+
+      cib_data if((Time.now.to_i - @last_cib_data_called).to_i > @last_call_timeout)
+
       problems_all      = @services_handled.nil?          ? 0 : @services_handled
       problems_critical = @services_handled_critical.nil? ? 0 : @services_handled_critical
       problems_warning  = @services_handled_warning.nil?  ? 0 : @services_handled_warning
@@ -586,6 +675,9 @@ module Icinga2
 
         # requires joins
         host_attrs = params.dig('joins','host')
+
+        return 0 if( host_attrs.nil? )
+
         host_state           = host_attrs.dig('state')
         host_acknowledgement = host_attrs.dig('acknowledgement')
         host_downtime_depth  = host_attrs.dig('downtime_depth')
@@ -612,10 +704,6 @@ module Icinga2
     # @param [Hash] hash
     # @param [String] host
     #
-    # @todo
-    #  this function are not operable
-    #  need help, time or beer
-    #
     # @api protected
     #
     # @return [Hash]