ruby-nagios 0.2.0 → 0.2.2

data/bin/check_check

@@ -78,7 +78,7 @@ class Nagios::Status::Model
 
 end # class Nagios::Status::Model
 
-Settings = Struct.new(:nagios_cfg, :status_path, :service_pattern, :host_pattern, :down_min_percent)
+Settings = Struct.new(:nagios_cfg, :status_path, :service_pattern, :host_pattern, :percent_critical, :percent_warning, :percent_unknown, :show_ok)
 def main(args)
   progname = File.basename($0)
   settings = Settings.new
@@ -102,9 +102,23 @@ def main(args)
       settings.host_pattern = val
     end
 
-    opts.on("-p NUM", "--percent NUM",
-            "Only alert if this percentage of the cluster is down") do |val|
-      settings.down_min_percent = Float(val)
+    opts.on( "--percent-warning NUM",
+            "Only alert if this percentage of the cluster is in warning state") do |val|
+      settings.percent_warning = Float(val)
+    end
+
+    opts.on( "--percent-critical NUM",
+            "Only alert if this percentage of the cluster is in critical state") do |val|
+      settings.percent_critical = Float(val)
+    end
+
+    opts.on( "--percent-unknown NUM",
+            "Only alert if this percentage of the cluster is in unknown state") do |val|
+      settings.percent_unknown = Float(val)
+    end
+
+    opts.on( "--show-ok", "Show details for checks in OK state too") do
+      settings.show_ok = true
     end
   end # OptionParser.new
 
@@ -148,44 +162,50 @@ def main(args)
   print "hosts=/#{settings.host_pattern}/ "
   puts
 
+  total_results = ["OK", "WARNING", "CRITICAL", "UNKNOWN"].inject(0) {|aggr,state| aggr += results[state].length}
+
   # More data output
-  total_results = 0.0
   ["WARNING", "CRITICAL", "UNKNOWN"].each do |state|
     if results[state] && results[state].size > 0
       puts "Services in #{state}:"
       results[state].sort { |a,b| a["host_name"] <=> b["host_name"] }.each do |service|
-        total_results += 1
-        puts "  #{service["host_name"]} => #{service["service_description"]} (#{service["plugin_output"]})"
+        if service["long_plugin_output"] and !service["long_plugin_output"].empty?
+          puts "  #{service["host_name"]} => #{service["service_description"]} (#{service["plugin_output"]})"
+          puts "  #{service["long_plugin_output"]}"
+        else
+          puts "  #{service["host_name"]} => #{service["service_description"]} (#{service["plugin_output"]})"
+        end
       end
     end # if results[state]
   end # for each non-OK state
 
-  # If everything is OK, still print detailed output for confirmation
-  if total_results == 0 and results["OK"].size > 0
-      puts "OK Services:"
-      results["OK"].sort { |a,b| a["host_name"] <=> b["host_name"] }.each do |service|
-        puts "  #{service["host_name"]} => #{service["service_description"]}"
-      end
+  if settings.show_ok and results["OK"].size > 0
+    puts "OK Services:"
+    results["OK"].sort { |a,b| a["host_name"] <=> b["host_name"] }.each do |service|
+      puts "  #{service["host_name"]} => #{service["service_description"]}"
+    end
   end
 
   exitcode = 0
 
-  if settings.down_min_percent
-      if results["WARNING"].length > 0 && (results["WARNING"].length / total_results) * 100 >= settings.down_min_percent
-          exitcode = 1
-      end
-      if results["CRITICAL"].length > 0 && (results["CRITICAL"].length / total_results) * 100 >= settings.down_min_percent
-          exitcode = 2
-      end
+  if settings.percent_unknown
+    exitcode = 3 if results["UNKNOWN"].length > 0 && (results["UNKNOWN"].length.to_f / total_results) * 100 >= settings.percent_unknown
   else
-    if results["WARNING"].length > 0
-      exitcode = 1
-    end
+    exitcode = 3 if results["UNKNOWN"].length > 0
+  end
 
-    if results["CRITICAL"].length > 0
-      exitcode = 2
-    end
+  if settings.percent_warning
+    exitcode = 1 if results["WARNING"].length > 0 && ((results["WARNING"].length.to_f + results["CRITICAL"].length.to_f) / total_results) * 100 >= settings.percent_warning
+  else
+    exitcode = 1 if results["WARNING"].length > 0
   end
+
+  if settings.percent_critical
+    exitcode = 2 if results["CRITICAL"].length > 0 && (results["CRITICAL"].length.to_f / total_results) * 100 >= settings.percent_critical
+  else
+    exitcode = 2 if results["CRITICAL"].length > 0
+  end
+
   return exitcode
 end
 

data/lib/nagios/config.rb

@@ -88,7 +88,7 @@ first one will be used. For example, Debian can have both Nagios 2 and
 
           @configuration[key] = val
           instance_variable_set("@#{key}", val)
-          instance_eval val =~ /^[\d\.-]+/ ? 
+          instance_eval val =~ /^[\d\.-]+$/ ? 
           "def #{key}; return #{val}; end" :
             "def #{key}; return %Q{#{val}}; end"
         end

data/lib/nagios/external_commands.rb

@@ -21,7 +21,7 @@ module Nagios
   class ExternalCommands
 
     require 'erb'
-    require_relative 'external_commands/list'
+    require 'nagios/external_commands/list'
 
     # Constructor for the external command write class.
     #
@@ -132,11 +132,11 @@ module Nagios
           end
         end
         
-        output << { data: params, result: messages.empty? , messages: messages }
+        output << { :data => params, :result => messages.empty? , :messages => messages }
         result &&= messages.empty?
       end # data.each
 
-      { result: result, data: output }
+      { :result => result, :data => output }
     end # def write
   end
 end

data/lib/nagios/external_commands/list.rb

@@ -16,170 +16,170 @@ module Nagios
     #
     # == Example
     #
-    #     PROCESS_SERVICE_CHECK_RESULT: %w{host_name service_description return_code plugin_output} 
+    #     :PROCESS_SERVICE_CHECK_RESULT => %w{host_name service_description return_code plugin_output} 
     #
     #     converted to template on print:
     #
     #     [timestamp] PROCESS_SERVICE_CHECK_RESULT;<%= host_name %>;<%= service_description %>;<%= return_code %>;<%= plugin_output %>\n
     #
     ACTIONS = { 
-      ACKNOWLEDGE_HOST_PROBLEM: %w{host_name sticky notify persistent author comment},
-      ACKNOWLEDGE_SVC_PROBLEM: %w{host_name service_description sticky notify persistent author comment},
-      ADD_HOST_COMMENT: %w{host_name persistent author comment},
-      ADD_SVC_COMMENT: %w{host_name service_description persistent author comment},
-      CHANGE_CONTACT_HOST_NOTIFICATION_TIMEPERIOD: %w{contact_name notification_timeperiod},
-      CHANGE_CONTACT_MODATTR: %w{contact_name value},
-      CHANGE_CONTACT_MODHATTR: %w{contact_name value},
-      CHANGE_CONTACT_MODSATTR: %w{contact_name value},
-      CHANGE_CONTACT_SVC_NOTIFICATION_TIMEPERIOD: %w{contact_name notification_timeperiod},
-      CHANGE_CUSTOM_CONTACT_VAR: %w{contact_name varname varvalue},
-      CHANGE_CUSTOM_HOST_VAR: %w{host_name varname varvalue},
-      CHANGE_CUSTOM_SVC_VAR: %w{host_name service_description varname varvalue},
-      CHANGE_GLOBAL_HOST_EVENT_HANDLER: %w{event_handler_command},
-      CHANGE_GLOBAL_SVC_EVENT_HANDLER: %w{event_handler_command},
-      CHANGE_HOST_CHECK_COMMAND: %w{host_name check_command},
-      CHANGE_HOST_CHECK_TIMEPERIOD: %w{host_name check_timeperod},
-      CHANGE_HOST_CHECK_TIMEPERIOD: %w{host_name timeperiod},
-      CHANGE_HOST_EVENT_HANDLER: %w{host_name event_handler_command},
-      CHANGE_HOST_MODATTR: %w{host_name value},
-      CHANGE_MAX_HOST_CHECK_ATTEMPTS: %w{host_name check_attempts},
-      CHANGE_MAX_SVC_CHECK_ATTEMPTS: %w{host_name service_description check_attempts},
-      CHANGE_NORMAL_HOST_CHECK_INTERVAL: %w{host_name check_interval},
-      CHANGE_NORMAL_SVC_CHECK_INTERVAL: %w{host_name service_description check_interval},
-      CHANGE_RETRY_HOST_CHECK_INTERVAL: %w{host_name service_description check_interval},
-      CHANGE_RETRY_SVC_CHECK_INTERVAL: %w{host_name service_description check_interval},
-      CHANGE_SVC_CHECK_COMMAND: %w{host_name service_description check_command},
-      CHANGE_SVC_CHECK_TIMEPERIOD: %w{host_name service_description check_timeperiod},
-      CHANGE_SVC_EVENT_HANDLER: %w{host_name service_description event_handler_command},
-      CHANGE_SVC_MODATTR: %w{host_name service_description value},
-      CHANGE_SVC_NOTIFICATION_TIMEPERIOD: %w{host_name service_description notification_timeperiod},
-      DELAY_HOST_NOTIFICATION: %w{host_name notification_time},
-      DELAY_SVC_NOTIFICATION: %w{host_name service_description notification_time},
-      DEL_ALL_HOST_COMMENTS: %w{host_name},
-      DEL_ALL_SVC_COMMENTS: %w{host_name service_description},
-      DEL_HOST_COMMENT: %w{comment_id},
-      DEL_HOST_DOWNTIME: %w{downtime_id},
-      DEL_SVC_COMMENT: %w{comment_id},
-      DEL_SVC_DOWNTIME: %w{downtime_id},
-      DISABLE_ALL_NOTIFICATIONS_BEYOND_HOST: %w{host_name},
-      DISABLE_CONTACTGROUP_HOST_NOTIFICATIONS: %w{contactgroup_name},
-      DISABLE_CONTACTGROUP_SVC_NOTIFICATIONS: %w{contactgroup_name},
-      DISABLE_CONTACT_HOST_NOTIFICATIONS: %w{contact_name},
-      DISABLE_CONTACT_SVC_NOTIFICATIONS: %w{contact_name},
-      DISABLE_EVENT_HANDLERS: [],
-      DISABLE_FAILURE_PREDICTION: [],
-      DISABLE_FLAP_DETECTION: [],
-      DISABLE_HOSTGROUP_HOST_CHECKS: %w{hostgroup_name},
-      DISABLE_HOSTGROUP_HOST_NOTIFICATIONS: %w{hostgroup_name},
-      DISABLE_HOSTGROUP_PASSIVE_HOST_CHECKS: %w{hostgroup_name},
-      DISABLE_HOSTGROUP_PASSIVE_SVC_CHECKS: %w{hostgroup_name},
-      DISABLE_HOSTGROUP_SVC_CHECKS: %w{hostgroup_name},
-      DISABLE_HOSTGROUP_SVC_NOTIFICATIONS: %w{hostgroup_name},
-      DISABLE_HOST_AND_CHILD_NOTIFICATIONS: %w{host_name},
-      DISABLE_HOST_CHECK: %w{host_name},
-      DISABLE_HOST_EVENT_HANDLER: %w{host_name},
-      DISABLE_HOST_FLAP_DETECTION: %w{host_name},
-      DISABLE_HOST_FRESHNESS_CHECKS: [],
-      DISABLE_HOST_NOTIFICATIONS: %w{host_name},
-      DISABLE_HOST_SVC_CHECKS: %w{host_name},
-      DISABLE_HOST_SVC_NOTIFICATIONS: %w{host_name},
-      DISABLE_NOTIFICATIONS: [],
-      DISABLE_PASSIVE_HOST_CHECKS: %w{host_name},
-      DISABLE_PASSIVE_SVC_CHECKS: %w{host_name service_description},
-      DISABLE_PERFORMANCE_DATA: [],
-      DISABLE_SERVICEGROUP_HOST_CHECKS: %w{servicegroup_name},
-      DISABLE_SERVICEGROUP_HOST_NOTIFICATIONS: %w{servicegroup_name},
-      DISABLE_SERVICEGROUP_PASSIVE_HOST_CHECKS: %w{servicegroup_name},
-      DISABLE_SERVICEGROUP_PASSIVE_SVC_CHECKS: %w{servicegroup_name},
-      DISABLE_SERVICEGROUP_SVC_CHECKS: %w{servicegroup_name},
-      DISABLE_SERVICEGROUP_SVC_NOTIFICATIONS: %w{servicegroup_name},
-      DISABLE_SERVICE_FLAP_DETECTION: %w{host_name service_description},
-      DISABLE_SERVICE_FRESHNESS_CHECKS: [],
-      DISABLE_SVC_CHECK: %w{host_name service_description},
-      DISABLE_SVC_EVENT_HANDLER: %w{host_name service_description},
-      DISABLE_SVC_FLAP_DETECTION: %w{host_name service_description},
-      DISABLE_SVC_NOTIFICATIONS: %w{host_name service_description},
-      ENABLE_ALL_NOTIFICATIONS_BEYOND_HOST: %w{host_name},
-      ENABLE_CONTACTGROUP_HOST_NOTIFICATIONS: %w{contactgroup_name},
-      ENABLE_CONTACTGROUP_SVC_NOTIFICATIONS: %w{contactgroup_name},
-      ENABLE_CONTACT_HOST_NOTIFICATIONS: %w{contact_name},
-      ENABLE_CONTACT_SVC_NOTIFICATIONS: %w{contact_name},
-      ENABLE_EVENT_HANDLERS: [],
-      ENABLE_FAILURE_PREDICTION: [],
-      ENABLE_FLAP_DETECTION: [],
-      ENABLE_HOSTGROUP_HOST_CHECKS: %w{hostgroup_name},
-      ENABLE_HOSTGROUP_HOST_NOTIFICATIONS: %w{hostgroup_name},
-      ENABLE_HOSTGROUP_PASSIVE_HOST_CHECKS: %w{hostgroup_name},
-      ENABLE_HOSTGROUP_PASSIVE_SVC_CHECKS: %w{hostgroup_name},
-      ENABLE_HOSTGROUP_SVC_CHECKS: %w{hostgroup_name},
-      ENABLE_HOSTGROUP_SVC_NOTIFICATIONS: %w{hostgroup_name},
-      ENABLE_HOST_AND_CHILD_NOTIFICATIONS: %w{host_name},
-      ENABLE_HOST_CHECK: %w{host_name},
-      ENABLE_HOST_EVENT_HANDLER: %w{host_name},
-      ENABLE_HOST_FLAP_DETECTION: %w{host_name},
-      ENABLE_HOST_FRESHNESS_CHECKS: [],
-      ENABLE_HOST_NOTIFICATIONS: %w{host_name},
-      ENABLE_HOST_SVC_CHECKS: %w{host_name},
-      ENABLE_HOST_SVC_NOTIFICATIONS: %w{host_name},
-      ENABLE_NOTIFICATIONS: [],
-      ENABLE_PASSIVE_HOST_CHECKS: %w{host_name},
-      ENABLE_PASSIVE_SVC_CHECKS: %w{host_name service_description},
-      ENABLE_PERFORMANCE_DATA: [],
-      ENABLE_SERVICEGROUP_HOST_CHECKS: %w{servicegroup_name},
-      ENABLE_SERVICEGROUP_HOST_NOTIFICATIONS: %w{servicegroup_name},
-      ENABLE_SERVICEGROUP_PASSIVE_HOST_CHECKS: %w{servicegroup_name},
-      ENABLE_SERVICEGROUP_PASSIVE_SVC_CHECKS: %w{servicegroup_name},
-      ENABLE_SERVICEGROUP_SVC_CHECKS: %w{servicegroup_name},
-      ENABLE_SERVICEGROUP_SVC_NOTIFICATIONS: %w{servicegroup_name},
-      ENABLE_SERVICE_FRESHNESS_CHECKS: [],
-      ENABLE_SVC_CHECK: %w{host_name service_description},
-      ENABLE_SVC_EVENT_HANDLER: %w{host_name service_description},
-      ENABLE_SVC_FLAP_DETECTION: %w{host_name service_description},
-      ENABLE_SVC_NOTIFICATIONS: %w{host_name service_description},
-      PROCESS_FILE: %w{file_name delete},
-      PROCESS_HOST_CHECK_RESULT: %w{host_name status_code plugin_output},
-      PROCESS_SERVICE_CHECK_RESULT: %w{host_name service_description return_code plugin_output},
-      READ_STATE_INFORMATION: [],
-      REMOVE_HOST_ACKNOWLEDGEMENT: %w{host_name},
-      REMOVE_SVC_ACKNOWLEDGEMENT: %w{host_name service_description},
-      RESTART_PROGRAM: [],
-      SAVE_STATE_INFORMATION: [],
-      SCHEDULE_AND_PROPAGATE_HOST_DOWNTIME: %w{host_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_AND_PROPAGATE_TRIGGERED_HOST_DOWNTIME: %w{host_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_FORCED_HOST_CHECK: %w{host_name check_time},
-      SCHEDULE_FORCED_HOST_SVC_CHECKS: %w{host_name check_time},
-      SCHEDULE_FORCED_SVC_CHECK: %w{host_name service_description check_time},
-      SCHEDULE_HOSTGROUP_HOST_DOWNTIME: %w{hostgroup_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_HOSTGROUP_SVC_DOWNTIME: %w{hostgroup_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_HOST_CHECK: %w{host_name check_time},
-      SCHEDULE_HOST_DOWNTIME: %w{host_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_HOST_SVC_CHECKS: %w{host_name check_time},
-      SCHEDULE_HOST_SVC_DOWNTIME: %w{host_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_SERVICEGROUP_HOST_DOWNTIME: %w{servicegroup_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_SERVICEGROUP_SVC_DOWNTIME: %w{servicegroup_name start_time end_time fixed trigger_id duration author comment},
-      SCHEDULE_SVC_CHECK: %w{host_name service_description check_time},
-      SCHEDULE_SVC_DOWNTIME: %w{host_name service_desription start_time end_time fixed trigger_id duration author comment},
-      SEND_CUSTOM_HOST_NOTIFICATION: %w{host_name options author comment},
-      SEND_CUSTOM_SVC_NOTIFICATION: %w{host_name service_description options author comment},
-      SET_HOST_NOTIFICATION_NUMBER: %w{host_name notification_number},
-      SET_SVC_NOTIFICATION_NUMBER: %w{host_name service_description notification_number},
-      SHUTDOWN_PROGRAM: [],
-      START_ACCEPTING_PASSIVE_HOST_CHECKS: [],
-      START_ACCEPTING_PASSIVE_SVC_CHECKS: [],
-      START_EXECUTING_HOST_CHECKS: [],
-      START_EXECUTING_SVC_CHECKS: [],
-      START_OBSESSING_OVER_HOST: %w{host_name},
-      START_OBSESSING_OVER_HOST_CHECKS: [],
-      START_OBSESSING_OVER_SVC: %w{host_name service_description},
-      START_OBSESSING_OVER_SVC_CHECKS: [],
-      STOP_ACCEPTING_PASSIVE_HOST_CHECKS: [],
-      STOP_ACCEPTING_PASSIVE_SVC_CHECKS: [],
-      STOP_EXECUTING_HOST_CHECKS: [],
-      STOP_EXECUTING_SVC_CHECKS: [],
-      STOP_OBSESSING_OVER_HOST: %w{host_name},
-      STOP_OBSESSING_OVER_HOST_CHECKS: [],
-      STOP_OBSESSING_OVER_SVC: %w{host_name service_description},
-      STOP_OBSESSING_OVER_SVC_CHECKS: []
+      :ACKNOWLEDGE_HOST_PROBLEM => %w{host_name sticky notify persistent author comment},
+      :ACKNOWLEDGE_SVC_PROBLEM => %w{host_name service_description sticky notify persistent author comment},
+      :ADD_HOST_COMMENT => %w{host_name persistent author comment},
+      :ADD_SVC_COMMENT => %w{host_name service_description persistent author comment},
+      :CHANGE_CONTACT_HOST_NOTIFICATION_TIMEPERIOD => %w{contact_name notification_timeperiod},
+      :CHANGE_CONTACT_MODATTR => %w{contact_name value},
+      :CHANGE_CONTACT_MODHATTR => %w{contact_name value},
+      :CHANGE_CONTACT_MODSATTR => %w{contact_name value},
+      :CHANGE_CONTACT_SVC_NOTIFICATION_TIMEPERIOD => %w{contact_name notification_timeperiod},
+      :CHANGE_CUSTOM_CONTACT_VAR => %w{contact_name varname varvalue},
+      :CHANGE_CUSTOM_HOST_VAR => %w{host_name varname varvalue},
+      :CHANGE_CUSTOM_SVC_VAR => %w{host_name service_description varname varvalue},
+      :CHANGE_GLOBAL_HOST_EVENT_HANDLER => %w{event_handler_command},
+      :CHANGE_GLOBAL_SVC_EVENT_HANDLER => %w{event_handler_command},
+      :CHANGE_HOST_CHECK_COMMAND => %w{host_name check_command},
+      :CHANGE_HOST_CHECK_TIMEPERIOD => %w{host_name check_timeperod},
+      :CHANGE_HOST_CHECK_TIMEPERIOD => %w{host_name timeperiod},
+      :CHANGE_HOST_EVENT_HANDLER => %w{host_name event_handler_command},
+      :CHANGE_HOST_MODATTR => %w{host_name value},
+      :CHANGE_MAX_HOST_CHECK_ATTEMPTS => %w{host_name check_attempts},
+      :CHANGE_MAX_SVC_CHECK_ATTEMPTS => %w{host_name service_description check_attempts},
+      :CHANGE_NORMAL_HOST_CHECK_INTERVAL => %w{host_name check_interval},
+      :CHANGE_NORMAL_SVC_CHECK_INTERVAL => %w{host_name service_description check_interval},
+      :CHANGE_RETRY_HOST_CHECK_INTERVAL => %w{host_name service_description check_interval},
+      :CHANGE_RETRY_SVC_CHECK_INTERVAL => %w{host_name service_description check_interval},
+      :CHANGE_SVC_CHECK_COMMAND => %w{host_name service_description check_command},
+      :CHANGE_SVC_CHECK_TIMEPERIOD => %w{host_name service_description check_timeperiod},
+      :CHANGE_SVC_EVENT_HANDLER => %w{host_name service_description event_handler_command},
+      :CHANGE_SVC_MODATTR => %w{host_name service_description value},
+      :CHANGE_SVC_NOTIFICATION_TIMEPERIOD => %w{host_name service_description notification_timeperiod},
+      :DELAY_HOST_NOTIFICATION => %w{host_name notification_time},
+      :DELAY_SVC_NOTIFICATION => %w{host_name service_description notification_time},
+      :DEL_ALL_HOST_COMMENTS => %w{host_name},
+      :DEL_ALL_SVC_COMMENTS => %w{host_name service_description},
+      :DEL_HOST_COMMENT => %w{comment_id},
+      :DEL_HOST_DOWNTIME => %w{downtime_id},
+      :DEL_SVC_COMMENT => %w{comment_id},
+      :DEL_SVC_DOWNTIME => %w{downtime_id},
+      :DISABLE_ALL_NOTIFICATIONS_BEYOND_HOST => %w{host_name},
+      :DISABLE_CONTACTGROUP_HOST_NOTIFICATIONS => %w{contactgroup_name},
+      :DISABLE_CONTACTGROUP_SVC_NOTIFICATIONS => %w{contactgroup_name},
+      :DISABLE_CONTACT_HOST_NOTIFICATIONS => %w{contact_name},
+      :DISABLE_CONTACT_SVC_NOTIFICATIONS => %w{contact_name},
+      :DISABLE_EVENT_HANDLERS => [],
+      :DISABLE_FAILURE_PREDICTION => [],
+      :DISABLE_FLAP_DETECTION => [],
+      :DISABLE_HOSTGROUP_HOST_CHECKS => %w{hostgroup_name},
+      :DISABLE_HOSTGROUP_HOST_NOTIFICATIONS => %w{hostgroup_name},
+      :DISABLE_HOSTGROUP_PASSIVE_HOST_CHECKS => %w{hostgroup_name},
+      :DISABLE_HOSTGROUP_PASSIVE_SVC_CHECKS => %w{hostgroup_name},
+      :DISABLE_HOSTGROUP_SVC_CHECKS => %w{hostgroup_name},
+      :DISABLE_HOSTGROUP_SVC_NOTIFICATIONS => %w{hostgroup_name},
+      :DISABLE_HOST_AND_CHILD_NOTIFICATIONS => %w{host_name},
+      :DISABLE_HOST_CHECK => %w{host_name},
+      :DISABLE_HOST_EVENT_HANDLER => %w{host_name},
+      :DISABLE_HOST_FLAP_DETECTION => %w{host_name},
+      :DISABLE_HOST_FRESHNESS_CHECKS => [],
+      :DISABLE_HOST_NOTIFICATIONS => %w{host_name},
+      :DISABLE_HOST_SVC_CHECKS => %w{host_name},
+      :DISABLE_HOST_SVC_NOTIFICATIONS => %w{host_name},
+      :DISABLE_NOTIFICATIONS => [],
+      :DISABLE_PASSIVE_HOST_CHECKS => %w{host_name},
+      :DISABLE_PASSIVE_SVC_CHECKS => %w{host_name service_description},
+      :DISABLE_PERFORMANCE_DATA => [],
+      :DISABLE_SERVICEGROUP_HOST_CHECKS => %w{servicegroup_name},
+      :DISABLE_SERVICEGROUP_HOST_NOTIFICATIONS => %w{servicegroup_name},
+      :DISABLE_SERVICEGROUP_PASSIVE_HOST_CHECKS => %w{servicegroup_name},
+      :DISABLE_SERVICEGROUP_PASSIVE_SVC_CHECKS => %w{servicegroup_name},
+      :DISABLE_SERVICEGROUP_SVC_CHECKS => %w{servicegroup_name},
+      :DISABLE_SERVICEGROUP_SVC_NOTIFICATIONS => %w{servicegroup_name},
+      :DISABLE_SERVICE_FLAP_DETECTION => %w{host_name service_description},
+      :DISABLE_SERVICE_FRESHNESS_CHECKS => [],
+      :DISABLE_SVC_CHECK => %w{host_name service_description},
+      :DISABLE_SVC_EVENT_HANDLER => %w{host_name service_description},
+      :DISABLE_SVC_FLAP_DETECTION => %w{host_name service_description},
+      :DISABLE_SVC_NOTIFICATIONS => %w{host_name service_description},
+      :ENABLE_ALL_NOTIFICATIONS_BEYOND_HOST => %w{host_name},
+      :ENABLE_CONTACTGROUP_HOST_NOTIFICATIONS => %w{contactgroup_name},
+      :ENABLE_CONTACTGROUP_SVC_NOTIFICATIONS => %w{contactgroup_name},
+      :ENABLE_CONTACT_HOST_NOTIFICATIONS => %w{contact_name},
+      :ENABLE_CONTACT_SVC_NOTIFICATIONS => %w{contact_name},
+      :ENABLE_EVENT_HANDLERS => [],
+      :ENABLE_FAILURE_PREDICTION => [],
+      :ENABLE_FLAP_DETECTION => [],
+      :ENABLE_HOSTGROUP_HOST_CHECKS => %w{hostgroup_name},
+      :ENABLE_HOSTGROUP_HOST_NOTIFICATIONS => %w{hostgroup_name},
+      :ENABLE_HOSTGROUP_PASSIVE_HOST_CHECKS => %w{hostgroup_name},
+      :ENABLE_HOSTGROUP_PASSIVE_SVC_CHECKS => %w{hostgroup_name},
+      :ENABLE_HOSTGROUP_SVC_CHECKS => %w{hostgroup_name},
+      :ENABLE_HOSTGROUP_SVC_NOTIFICATIONS => %w{hostgroup_name},
+      :ENABLE_HOST_AND_CHILD_NOTIFICATIONS => %w{host_name},
+      :ENABLE_HOST_CHECK => %w{host_name},
+      :ENABLE_HOST_EVENT_HANDLER => %w{host_name},
+      :ENABLE_HOST_FLAP_DETECTION => %w{host_name},
+      :ENABLE_HOST_FRESHNESS_CHECKS => [],
+      :ENABLE_HOST_NOTIFICATIONS => %w{host_name},
+      :ENABLE_HOST_SVC_CHECKS => %w{host_name},
+      :ENABLE_HOST_SVC_NOTIFICATIONS => %w{host_name},
+      :ENABLE_NOTIFICATIONS => [],
+      :ENABLE_PASSIVE_HOST_CHECKS => %w{host_name},
+      :ENABLE_PASSIVE_SVC_CHECKS => %w{host_name service_description},
+      :ENABLE_PERFORMANCE_DATA => [],
+      :ENABLE_SERVICEGROUP_HOST_CHECKS => %w{servicegroup_name},
+      :ENABLE_SERVICEGROUP_HOST_NOTIFICATIONS => %w{servicegroup_name},
+      :ENABLE_SERVICEGROUP_PASSIVE_HOST_CHECKS => %w{servicegroup_name},
+      :ENABLE_SERVICEGROUP_PASSIVE_SVC_CHECKS => %w{servicegroup_name},
+      :ENABLE_SERVICEGROUP_SVC_CHECKS => %w{servicegroup_name},
+      :ENABLE_SERVICEGROUP_SVC_NOTIFICATIONS => %w{servicegroup_name},
+      :ENABLE_SERVICE_FRESHNESS_CHECKS => [],
+      :ENABLE_SVC_CHECK => %w{host_name service_description},
+      :ENABLE_SVC_EVENT_HANDLER => %w{host_name service_description},
+      :ENABLE_SVC_FLAP_DETECTION => %w{host_name service_description},
+      :ENABLE_SVC_NOTIFICATIONS => %w{host_name service_description},
+      :PROCESS_FILE => %w{file_name delete},
+      :PROCESS_HOST_CHECK_RESULT => %w{host_name status_code plugin_output},
+      :PROCESS_SERVICE_CHECK_RESULT => %w{host_name service_description return_code plugin_output},
+      :READ_STATE_INFORMATION => [],
+      :REMOVE_HOST_ACKNOWLEDGEMENT => %w{host_name},
+      :REMOVE_SVC_ACKNOWLEDGEMENT => %w{host_name service_description},
+      :RESTART_PROGRAM => [],
+      :SAVE_STATE_INFORMATION => [],
+      :SCHEDULE_AND_PROPAGATE_HOST_DOWNTIME => %w{host_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_AND_PROPAGATE_TRIGGERED_HOST_DOWNTIME => %w{host_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_FORCED_HOST_CHECK => %w{host_name check_time},
+      :SCHEDULE_FORCED_HOST_SVC_CHECKS => %w{host_name check_time},
+      :SCHEDULE_FORCED_SVC_CHECK => %w{host_name service_description check_time},
+      :SCHEDULE_HOSTGROUP_HOST_DOWNTIME => %w{hostgroup_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_HOSTGROUP_SVC_DOWNTIME => %w{hostgroup_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_HOST_CHECK => %w{host_name check_time},
+      :SCHEDULE_HOST_DOWNTIME => %w{host_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_HOST_SVC_CHECKS => %w{host_name check_time},
+      :SCHEDULE_HOST_SVC_DOWNTIME => %w{host_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_SERVICEGROUP_HOST_DOWNTIME => %w{servicegroup_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_SERVICEGROUP_SVC_DOWNTIME => %w{servicegroup_name start_time end_time fixed trigger_id duration author comment},
+      :SCHEDULE_SVC_CHECK => %w{host_name service_description check_time},
+      :SCHEDULE_SVC_DOWNTIME => %w{host_name service_desription start_time end_time fixed trigger_id duration author comment},
+      :SEND_CUSTOM_HOST_NOTIFICATION => %w{host_name options author comment},
+      :SEND_CUSTOM_SVC_NOTIFICATION => %w{host_name service_description options author comment},
+      :SET_HOST_NOTIFICATION_NUMBER => %w{host_name notification_number},
+      :SET_SVC_NOTIFICATION_NUMBER => %w{host_name service_description notification_number},
+      :SHUTDOWN_PROGRAM => [],
+      :START_ACCEPTING_PASSIVE_HOST_CHECKS => [],
+      :START_ACCEPTING_PASSIVE_SVC_CHECKS => [],
+      :START_EXECUTING_HOST_CHECKS => [],
+      :START_EXECUTING_SVC_CHECKS => [],
+      :START_OBSESSING_OVER_HOST => %w{host_name},
+      :START_OBSESSING_OVER_HOST_CHECKS => [],
+      :START_OBSESSING_OVER_SVC => %w{host_name service_description},
+      :START_OBSESSING_OVER_SVC_CHECKS => [],
+      :STOP_ACCEPTING_PASSIVE_HOST_CHECKS => [],
+      :STOP_ACCEPTING_PASSIVE_SVC_CHECKS => [],
+      :STOP_EXECUTING_HOST_CHECKS => [],
+      :STOP_EXECUTING_SVC_CHECKS => [],
+      :STOP_OBSESSING_OVER_HOST => %w{host_name},
+      :STOP_OBSESSING_OVER_HOST_CHECKS => [],
+      :STOP_OBSESSING_OVER_SVC => %w{host_name service_description},
+      :STOP_OBSESSING_OVER_SVC_CHECKS => []
     }.freeze
   end
 end

data/lib/nagios/objects.rb

@@ -101,6 +101,17 @@ Example of a parsed object:
     nagios.contactgroup
     => {"admins"=>{:contactgroup_name=>"admins", :alias=>"Nagios Administrators", :members=>"root"}}
 
+Services are a bit different from other objects, since they are
+related to hosts, all host's services are nested under hostname, as:
+
+    nagios.service =>
+       {"airport"=>
+          {"PING"=>
+            { :host_name=>"airport",
+              :service_description=>"PING",
+
+
+
 === Convenience methods
 
 Method parse creates helper methods for every type of object after
@@ -124,7 +135,18 @@ parsing. Same property can be accessed either using Hash @objects
           # Process it. Each block type has line <type>_name in the definition: host_name, command_name
           #
           @objects[handler] ||= {}
-          @objects[handler][block["#{handler.to_s}_name".to_sym]] = block 
+          case handler
+          when :service
+            #
+            # Service has service_description,  not name. Nest service
+            # hashes under hostnames.
+            #
+            next unless block[:host_name]
+            @objects[handler][block[:host_name]] ||= { }
+            @objects[handler][block[:host_name]][block["#{handler.to_s}_description".to_sym]] = block 
+          else
+            @objects[handler][block["#{handler.to_s}_name".to_sym]] = block 
+          end
           block = { }
        when line =~ /^\s*(\w+)\s+([^\{\}]+)$/  # Build Hash from key-value pairs like: "max_check_attempts      10"
           block[$1.to_sym] = $2.strip
@@ -188,3 +210,4 @@ parsing. Same property can be accessed either using Hash @objects
   end
 end
 
+

data/lib/nagios/status.rb

@@ -23,7 +23,7 @@ module Nagios
 
       @status, handler, blocklines = {'hosts' => {}}, '', []
 
-      File.readlines(path).each do |line|
+      File.readlines(path, :encoding => 'iso-8859-1').each do |line|
 
         # start of new sections
         if line =~ /(\w+) \{/
@@ -193,14 +193,14 @@ module Nagios
 
     # Figures out the service name from a block in a nagios status file
     def get_service_name(lines)
-      if s = lines.grep(/\s+service_description=(\w+)/).first
+      if s = lines.grep(/\s+service_description=(\S+)/).first
         if s =~ /service_description=(.+)$/
           service = $1
         else
           raise("Cant't parse service in block: #{s}")
         end
       else
-        raise("Cant't find a hostname in block")
+        raise("Cant't find a service in block")
       end
 
       service

data/ruby-nagios.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'ruby-nagios'
-  s.version = "0.2.0"
+  s.version = "0.2.2"
   s.author = 'R.I.Pienaar'
   s.email = 'rip@devco.net'
   s.homepage = 'http://devco.net/'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-nagios
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-16 00:00:00 +01:00
+date: 2014-05-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency