ruby-nagios 0.1.0 → 0.2.0

data/bin/check_check

@@ -155,7 +155,7 @@ def main(args)
       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"]}"
+        puts "  #{service["host_name"]} => #{service["service_description"]} (#{service["plugin_output"]})"
       end
     end # if results[state]
   end # for each non-OK state

data/bin/nagsrv

@@ -46,6 +46,9 @@
 # --acknowledge
 #   Ackknowledge services without sending notifies
 #
+# --delete-comments
+#   Delete the comments for selected services
+#
 # Released under the terms of the Apache version 2
 # license
 #
@@ -63,6 +66,7 @@ forhost = []
 notify = nil
 action = nil
 options = nil
+current_state = nil
 
 OptionParser.new do |opts|
   opts.separator "General Options"
@@ -91,6 +95,21 @@ OptionParser.new do |opts|
     forhost << v
   end
 
+  opts.on("--critical", "List only services which are critical") do
+    raise("Cannot use --critical with --ok or --warning") unless current_state.nil?
+    current_state = 2
+  end
+
+  opts.on("--warning", "List only services which are warning") do
+    raise("Cannot use --warning with --critical or --ok") unless current_state.nil?
+    current_state = 1
+  end
+
+  opts.on("--ok", "List only services which are ok") do
+    raise("Cannot use --ok with --critical or --warning") unless current_state.nil?
+    current_state = 0
+  end
+
   opts.on("--notify-enabled", "List only services with notification enabled") do
     notify = 1
   end
@@ -124,6 +143,12 @@ OptionParser.new do |opts|
   opts.on("--ackknowledge", "Ackknowledge services without sending notifies") do
     action = "[${tstamp}] ACKNOWLEDGE_SVC_PROBLEM;${host};${service};1;0;1;#{ENV['USER']};Acknowledged from CLI"
   end
+
+  opts.on("--delete-comments", "") do
+    comment_id = 1
+    action = "[${tstamp}] DEL_SVC_COMMENT;${comment_id};${tstamp}"
+  end
+
 end.parse!
 
 abort "Cannot find #{statusfile}" unless File.exist?(statusfile)
@@ -145,7 +170,7 @@ if listservices && action == nil
   action = "${service}"
 end
 
-options = {:forhost => forhost, :notifyenabled => notify, :action => action, :withservice => withservice}
+options = {:forhost => forhost, :notifyenabled => notify, :action => action, :withservice => withservice, :current_state => current_state}
 services = nagios.find_services(options)
 
 puts services.join("\n")

data/lib/nagios/external_commands.rb

@@ -133,6 +133,7 @@ module Nagios
         end
         
         output << { data: params, result: messages.empty? , messages: messages }
+        result &&= messages.empty?
       end # data.each
 
       { result: result, data: output }

data/lib/nagios/status.rb

@@ -89,6 +89,7 @@ module Nagios
       withservice = options.fetch(:withservice, [])
       acknowledged = options.fetch(:acknowledged, nil)
       passive = options.fetch(:passive, nil)
+      current_state = options.fetch(:current_state, nil)
 
       services = []
       searchquery = []
@@ -103,6 +104,7 @@ module Nagios
         searchquery << search_term("service_description", s)
       end
 
+      searchquery << {"current_state" => current_state } if current_state
       searchquery << {"notifications_enabled" => notifications.to_s} if notifications
       searchquery << {"problem_has_been_acknowledged" => acknowledged.to_s} if acknowledged
       if passive

data/ruby-nagios.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'ruby-nagios'
-  s.version = "0.1.0"
+  s.version = "0.2.0"
   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: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-27 00:00:00 +00:00
+date: 2013-07-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency