icinga2 0.7.0.1 → 0.8.1.2

data/lib/icinga2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icinga2
 version: !ruby/object:Gem::Version
-  version: 0.7.0.1
+  version: 0.8.1.2
 platform: ruby
 authors:
 - Bodo Schulz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -174,6 +174,7 @@ files:
 - doc/notifications.md
 - doc/servicegroups.md
 - doc/services.md
+- doc/statistics.md
 - doc/status.md
 - doc/top-level-namespace.html
 - doc/usergroups.md
@@ -185,10 +186,11 @@ files:
 - lib/icinga2/hostgroups.rb
 - lib/icinga2/hosts.rb
 - lib/icinga2/network.rb
+- lib/icinga2/network.rb-SAVE
 - lib/icinga2/notifications.rb
 - lib/icinga2/servicegroups.rb
 - lib/icinga2/services.rb
-- lib/icinga2/status.rb
+- lib/icinga2/statistics.rb
 - lib/icinga2/tools.rb
 - lib/icinga2/usergroups.rb
 - lib/icinga2/users.rb

data/lib/icinga2/status.rb

@@ -1,210 +0,0 @@
-
-# frozen_string_literal: true
-
-module Icinga2
-
-  # namespace for status handling
-  module Status
-
-    # return Icinga2 Application data
-    #
-    # @example
-    #    @icinga.application_data
-    #
-    # @return [Hash]
-    #
-    def application_data
-
-      Network.get(host: nil,
-        url: format( '%s/v1/status/IcingaApplication', @icinga_api_url_base ),
-        headers: @headers,
-        options: @options)
-    end
-
-    # return Icinga2 CIB
-    #
-    # @example
-    #    @icinga.cib_data
-    #
-    # @return [Hash]
-    #
-    def cib_data
-
-      Network.get(host: nil,
-        url: format( '%s/v1/status/CIB', @icinga_api_url_base ),
-        headers: @headers,
-        options: @options)
-
-    end
-
-    #
-    #
-    #
-    def status_data
-
-      data = Network.get_raw(host: nil,
-        url: format( '%s/v1/status', @icinga_api_url_base ),
-        headers: @headers,
-        options: @options)
-
-      return nil unless data.dig(:status) != 200
-
-      data.dig('results')
-
-    end
-
-    # return Icinga2 API Listener
-    #
-    # @example
-    #    @icinga.api_listener
-    #
-    # @return [Hash]
-    #
-    def api_listener
-
-      Network.get(host: nil,
-        url: format( '%s/v1/status/ApiListener', @icinga_api_url_base ),
-        headers: @headers,
-        options: @options)
-
-    end
-
-    # return queue statistics from the api
-    #
-    # @example
-    #    @icinga.work_queue_statistics
-    #
-    # @return [Hash]
-    #
-    def work_queue_statistics
-
-      stats  = {}
-      data   = Network.get_raw(host: nil,
-        url: format( '%s/v1/status', @icinga_api_url_base ),
-        headers: @headers,
-        options: @options)
-
-      return stats if data.nil?
-
-      data = data.dig(:data)
-
-      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')
-
-      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))
-
-      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
-    end
-
-
-    # extract many datas from application_data and cib_data
-    # and store them in global variables
-    #
-    def extract_data
-
-      a_data = application_data
-
-      if( a_data.is_a?(Hash) )
-
-        a_data = a_data.dig('status','icingaapplication','app')
-
-        unless( a_data.nil? )
-
-          # extract
-          #   - version
-          @version, @revision = parse_version(a_data.dig('version'))
-
-          #   - node_name
-          @node_name = a_data.dig('node_name')
-
-          #   - start_time
-          @start_time = Time.at(a_data.dig('program_start').to_f)
-        end
-      end
-
-      c_data = cib_data
-
-      if( c_data.is_a?(Hash) )
-
-        c_data = c_data.dig('status')
-
-        unless( c_data.nil? )
-
-          # extract
-          #   - uptime
-          uptime   = c_data.dig('uptime').round(2)
-          @uptime  = Time.at(uptime).utc.strftime('%H:%M:%S')
-
-          #   - avg_latency / avg_execution_time
-          @avg_latency        = c_data.dig('avg_latency').round(2)
-          @avg_execution_time = c_data.dig('avg_execution_time').round(2)
-
-          #   - hosts
-          @hosts_up           = c_data.dig('num_hosts_up').to_i
-          @hosts_down         = c_data.dig('num_hosts_down').to_i
-          @hosts_in_downtime  = c_data.dig('num_hosts_in_downtime').to_i
-          @hosts_acknowledged = c_data.dig('num_hosts_acknowledged').to_i
-
-          h_objects = host_objects
-          all_hosts = h_objects.dig(:nodes)
-
-          @hosts_all                       = all_hosts.size
-          @hosts_problems                  = host_problems
-          @hosts_problems_down             = handled_problems(h_objects, Icinga2::HOSTS_DOWN)
-
-          # calculate host problems adjusted by handled problems
-          # count togther handled host problems
-#           @hosts_handled_problems          = @hosts_handled_warning_problems + @hosts_handled_critical_problems + @hosts_handled_unknown_problems
-#           @hosts_down_adjusted             = @hosts_down - @hosts_handled_problems
-
-          #   - services
-          @services_ok           = c_data.dig('num_services_ok').to_i
-          @services_warning      = c_data.dig('num_services_warning').to_i
-          @services_critical     = c_data.dig('num_services_critical').to_i
-          @services_unknown      = c_data.dig('num_services_unknown').to_i
-          @services_in_downtime  = c_data.dig('num_services_in_downtime').to_i
-          @services_acknowledged = c_data.dig('num_services_acknowledged').to_i
-
-          s_objects = service_objects
-          all_services = s_objects.dig(:nodes)
-
-          @services_all                       = all_services.size
-          @services_problems                  = service_problems
-          @services_handled_warning_problems  = handled_problems(s_objects, Icinga2::SERVICE_STATE_WARNING)
-          @services_handled_critical_problems = handled_problems(s_objects, Icinga2::SERVICE_STATE_CRITICAL)
-          @services_handled_unknown_problems  = handled_problems(s_objects, Icinga2::SERVICE_STATE_UNKNOWN)
-
-          # calculate service problems adjusted by handled problems
-          @services_warning_adjusted  = @services_warning - @services_handled_warning_problems
-          @services_critical_adjusted = @services_critical - @services_handled_critical_problems
-          @services_unknown_adjusted  = @services_unknown - @services_handled_unknown_problems
-
-
-          #   - check stats
-          @hosts_active_checks_1min     = c_data.dig('active_host_checks_1min')
-          @hosts_passive_checks_1min    = c_data.dig('passive_host_checks_1min')
-          @services_active_checks_1min  = c_data.dig('active_service_checks_1min')
-          @services_passive_checks_1min = c_data.dig('passive_service_checks_1min')
-
-          @service_problems, @service_problems_severity = problem_services
-        end
-      end
-    end
-
-  end
-end