ruby-nagios 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3c2a8bf32d0a1965466db4026791ec2b66d51278
+  data.tar.gz: fd274333c72f6e806aaa90adaf4c523316b535b9
+SHA512:
+  metadata.gz: 9bcdf9200cdea805212da1d108d8ccf08281028cba5711738d46d16ca1cdf0504d6153f4b307a9e6ab503a3593799c591a6048dd871df065a33097494e3bb4db
+  data.tar.gz: dd10c49df03ad0df88dabe8995e65b72803c8e3038bc58ab8de4ef1e9365f0fb8f5c765963f9d24fa904ab51a0156fab83914d30ac4a7bb20b80af7630079288

data/.gitignore

@@ -1,4 +1,5 @@
 pkg
 doc
+Gemfile.lock
 .yardoc
 .DS_Store

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1
+  - 2.2
+script: RSPEC_ENV=test bundle exec rspec -f d

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/bin/check_check

@@ -58,8 +58,8 @@ class Nagios::Status::Model
           # in a soft state transition.
         end
 
-        # TODO(sissel): Maybe also skip checks that are 'acknowledged'
-        matches << status
+        # Add status but not if the checks have been 'acknowledged'
+        matches << status if status["problem_has_been_acknowledged"] == "0"
       end
     end # hosts().each
     return matches
@@ -78,7 +78,7 @@ class Nagios::Status::Model
 
 end # class Nagios::Status::Model
 
-Settings = Struct.new(:nagios_cfg, :status_path, :service_pattern, :host_pattern, :percent_critical, :percent_warning, :percent_unknown, :show_ok)
+Settings = Struct.new(:nagios_cfg, :status_path, :service_pattern, :host_pattern, :percent_critical, :percent_warning, :percent_unknown, :show_ok, :quiet, :aggr)
 def main(args)
   progname = File.basename($0)
   settings = Settings.new
@@ -120,6 +120,12 @@ def main(args)
     opts.on( "--show-ok", "Show details for checks in OK state too") do
       settings.show_ok = true
     end
+    opts.on( "--quiet", "Quiet output") do
+      settings.quiet = true
+    end
+    opts.on( "--aggr", "Aggregate states") do
+      settings.aggr = true
+    end
   end # OptionParser.new
 
   opts.parse!(args)
@@ -154,30 +160,34 @@ def main(args)
     results[state] << service_status
   end
 
+  total_results = ["OK", "WARNING", "CRITICAL", "UNKNOWN"].inject(0) {|aggr,state| aggr += results[state].length}
   # Output a summary line
   ["OK", "WARNING", "CRITICAL", "UNKNOWN"].each do | state|
     print "#{state}=#{results[state].length} "
   end
   print "services=/#{settings.service_pattern}/ "
   print "hosts=/#{settings.host_pattern}/ "
+  if settings.aggr
+      print "Problems: #{((results["UNKNOWN"].length + results["WARNING"].length + results["CRITICAL"].length).to_f / total_results) * 100}% "
+  end
   puts
 
-  total_results = ["OK", "WARNING", "CRITICAL", "UNKNOWN"].inject(0) {|aggr,state| aggr += results[state].length}
-
   # More data output
-  ["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|
-        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"]})"
+  if !settings.quiet
+    ["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|
+          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
-    end # if results[state]
-  end # for each non-OK state
+      end # if results[state]
+    end # for each non-OK state
+  end # for !quiet
 
   if settings.show_ok and results["OK"].size > 0
     puts "OK Services:"
@@ -188,22 +198,40 @@ def main(args)
 
   exitcode = 0
 
-  if settings.percent_unknown
-    exitcode = 3 if results["UNKNOWN"].length > 0 && (results["UNKNOWN"].length.to_f / total_results) * 100 >= settings.percent_unknown
-  else
-    exitcode = 3 if results["UNKNOWN"].length > 0
-  end
+  if !settings.aggr
+    if settings.percent_unknown
+      exitcode = 3 if results["UNKNOWN"].length > 0 && (results["UNKNOWN"].length.to_f / total_results) * 100 >= settings.percent_unknown
+    else
+      exitcode = 3 if results["UNKNOWN"].length > 0
+    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_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
+    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
   else
-    exitcode = 2 if results["CRITICAL"].length > 0
+    if settings.percent_unknown
+      exitcode = 3 if results["UNKNOWN"].length > 0 && (results["UNKNOWN"].length.to_f / total_results) * 100 >= settings.percent_unknown
+    else
+      exitcode = 3 if results["UNKNOWN"].length > 0
+    end
+    if settings.percent_warning
+      exitcode = 1 if ((results["UNKNOWN"].length + results["WARNING"].length + 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["UNKNOWN"].length + results["WARNING"].length + results["CRITICAL"].length).to_f / total_results) * 100 >= settings.percent_critical
+    else
+      exitcode = 2 if results["CRITICAL"].length > 0
+    end
   end
 
   return exitcode

data/bin/nagsrv

@@ -44,7 +44,7 @@
 #   Force checks for selected services
 #
 # --acknowledge
-#   Ackknowledge services without sending notifies
+#   Acknowledge services without sending notifies
 #
 # --delete-comments
 #   Delete the comments for selected services
@@ -67,6 +67,8 @@ notify = nil
 action = nil
 options = nil
 current_state = nil
+json = nil
+details = nil
 
 OptionParser.new do |opts|
   opts.separator "General Options"
@@ -84,6 +86,15 @@ OptionParser.new do |opts|
     listservices = true
   end
 
+  opts.on("--json", "Returns complete json data instead of service names only") do
+    json = true
+  end
+
+  opts.on("--details", "Include additional serivce details in output") do
+    details = true
+    raise("Cannot use --details wirh --json") unless json.nil?
+  end
+
   opts.separator ""
   opts.separator "Service and Host Selectors"
 
@@ -140,7 +151,7 @@ OptionParser.new do |opts|
     action = "[${tstamp}] SCHEDULE_FORCED_SVC_CHECK;${host};${service};${tstamp}"
   end
 
-  opts.on("--ackknowledge", "Ackknowledge services without sending notifies") do
+  opts.on("--acknowledge", "Acknowledge services without sending notifies") do
     action = "[${tstamp}] ACKNOWLEDGE_SVC_PROBLEM;${host};${service};1;0;1;#{ENV['USER']};Acknowledged from CLI"
   end
 
@@ -170,7 +181,7 @@ if listservices && action == nil
   action = "${service}"
 end
 
-options = {:forhost => forhost, :notifyenabled => notify, :action => action, :withservice => withservice, :current_state => current_state}
+options = {:forhost => forhost, :notifyenabled => notify, :action => action, :withservice => withservice, :current_state => current_state, :json => json, :details => details}
 services = nagios.find_services(options)
 
 puts services.join("\n")

data/lib/nagios/external_commands.rb

@@ -65,7 +65,7 @@ module Nagios
     :hostgroup_name, :servicegroup_name, :file_name, :delete,
     :status_code, :plugin_output, :return_code, :start_time,
     :end_time, :fixed, :trigger_id, :duration, :check_time,
-    :service_desription, :start_time, :options, :notification_number
+    :service_description, :start_time, :options, :notification_number
 
     # Get private binding to use with ERB bindings.
     def get_binding

data/lib/nagios/external_commands/list.rb

@@ -38,7 +38,6 @@ module Nagios
       :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},
@@ -158,7 +157,7 @@ module Nagios
       :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},
+      :SCHEDULE_SVC_DOWNTIME => %w{host_name service_description 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},

data/lib/nagios/status.rb

@@ -2,10 +2,9 @@ module Nagios
   class Status
     attr_reader :status, :path
 
-
     def initialize(statusfile=nil)
       if statusfile
-        raise ArgumentError, "Statusfile file name must be provided" unless statusfile    
+        raise ArgumentError, "Statusfile file name must be provided" unless statusfile
         raise RuntimeError, "Statusfile #{statusfile} does not exist" unless File.exist? statusfile
         raise RuntimeError, "Statusfile #{statusfile} is not readable" unless File.readable? statusfile
         @path = statusfile
@@ -90,6 +89,8 @@ module Nagios
       acknowledged = options.fetch(:acknowledged, nil)
       passive = options.fetch(:passive, nil)
       current_state = options.fetch(:current_state, nil)
+      json = options.fetch(:json, false)
+      details = options.fetch(:details, false)
 
       services = []
       searchquery = []
@@ -126,7 +127,24 @@ module Nagios
         services << parse_command_template(action, host_name, service_description, service_description)
       end
 
-      services.uniq.sort
+      if json
+        [ "[", svcs.join(", \n").gsub("=>", ":"), "]" ]
+      elsif details
+        space = ' '*100
+        delim = ' '
+        state = ['OK', 'Warning', 'Critical', 'Unknown']
+        details = Array.new
+        svcs.each do |s|
+          details << (s['host_name'] + space)[0, 25] + delim \
+                   + (s['service_description'] + space)[0,35] + delim \
+                   + (state[s['current_state'].to_i].to_s + space)[0,8] + delim \
+                   + (s['plugin_output'] + space)[0,120]
+        end
+        details
+
+      else
+        services.uniq.sort
+      end
     end
 
     private

data/ruby-nagios.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'ruby-nagios'
-  s.version = "0.2.2"
+  s.version = "0.3.0"
   s.author = 'R.I.Pienaar'
   s.email = 'rip@devco.net'
   s.homepage = 'http://devco.net/'
@@ -12,4 +12,5 @@ spec = Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.has_rdoc = false
   s.add_development_dependency('rake')
+  s.add_development_dependency "rspec", "~> 3"
 end

data/spec/00_configuration_spec.rb

@@ -9,10 +9,10 @@ describe "Configuration" do
 
   context "nagios.cfg" do
 
-    it { File.should exist @cfg.path }
+    it { expect(File).to exist @cfg.path }
     
     it "should be parseable" do
-      lambda { @cfg.parse }.should_not raise_error
+      expect { @cfg.parse }.not_to raise_error
     end
 
     context "parsing nagios.cfg file" do 
@@ -20,11 +20,11 @@ describe "Configuration" do
       before { @cfg.parse }
       
       it "should have PATH to objects file" do 
-        @cfg.object_cache_file.should be_a_kind_of String 
+        expect(@cfg.object_cache_file).to be_a_kind_of String
       end
       
       it "should have PATH to status file" do
-        @cfg.status_file.should be_a_kind_of String 
+        expect(@cfg.status_file).to be_a_kind_of String
       end
 
     end # parsing nagios.cfg file
@@ -38,24 +38,24 @@ describe "Configuration" do
       context "OOP style" do
         subject { Nagios::Status.new( ::TEST[:status_file]  || @cfg.status_file ) }
         
-        it { File.should exist( subject.path ) }
+        it { expect(File).to exist( subject.path ) }
         
         it "should be parseable" do
-          lambda { subject.parse }.should_not raise_error
+          expect { subject.parse }.not_to raise_error
         end
       end
 
       context "using parameter for parse method" do
         subject { Nagios::Status.new() }
         
-        it { File.should exist( (::TEST[:status_file]  || @cfg.status_file) ) }
+        it { expect(File).to exist( (::TEST[:status_file]  || @cfg.status_file) ) }
         
         it "should be parseable" do
-          lambda { subject.parse(::TEST[:status_file]  || @cfg.status_file) }.should_not raise_error
+          expect { subject.parse(::TEST[:status_file]  || @cfg.status_file) }.not_to raise_error
         end
 
         it "should fail without a filename" do
-          lambda { subject.parse() }.should raise_error
+          expect { subject.parse() }.to raise_error
         end
 
       end
@@ -67,10 +67,10 @@ describe "Configuration" do
 
       subject {  Nagios::Objects.new( ::TEST[:object_cache_file] || @cfg.object_cache_file) }
 
-      it { File.should exist subject.path }
+      it { expect(File).to exist subject.path }
       
       it "should be parseable" do
-        lambda { subject.parse }.should_not raise_error
+        expect { subject.parse }.not_to raise_error
       end
     end # Nagios::Objects
 

metadata

@@ -1,49 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-nagios
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-25 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-05-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Manage alerts, checks and acks in bulk
 email: rip@devco.net
-executables: 
+executables:
 - check_check
 - nagsrv
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - COPYING
+- Gemfile
 - README.md
 - Rakefile
 - bin/check_check
@@ -65,39 +71,27 @@ files:
 - test/data/nagios.cfg
 - test/data/objects.cache
 - test/data/status.dat
-has_rdoc: true
 homepage: http://devco.net/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby library for managing Nagios
 test_files: []
-