nagiosharder 0.4.0.rc1 → 0.4.0

data/.gitignore

@@ -22,5 +22,3 @@ pkg
 nagiosharder*.gem
 .bundle
 vendor/gems
-config
-*.yml

data/Gemfile.lock

@@ -3,8 +3,8 @@ PATH
   specs:
     nagiosharder (0.4.0)
       activesupport
-      hashie (~> 1.2.0)
-      httparty (~> 0.8.3)
+      hashie (~> 1.0.0)
+      httparty (~> 0.6.1)
       i18n
       nokogiri
       rest-client (~> 1.6.1)
@@ -13,19 +13,17 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
+    crack (0.1.8)
     diff-lcs (1.1.3)
-    hashie (1.2.0)
-    httparty (0.8.3)
-      multi_json (~> 1.0)
-      multi_xml
-    i18n (0.6.1)
-    mime-types (1.19)
-    multi_json (1.3.6)
-    multi_xml (0.5.1)
-    nokogiri (1.5.5)
+    hashie (1.0.0)
+    httparty (0.6.1)
+      crack (= 0.1.8)
+    i18n (0.6.0)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    nokogiri (1.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.7.0)
@@ -36,7 +34,7 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    terminal-table (1.4.5)
+    terminal-table (1.4.4)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -12,7 +12,7 @@ Here's some examples to get you started with the Ruby API:
   require 'nagiosharder'
   site = NagiosHarder::Site.new('http://path/to/nagios/cgi/directory', 'user', 'password', 'version')
   # version defaults to 3
-
+  
   # get details back about a host's services
   puts site.host_status('myhost')
 
@@ -20,28 +20,16 @@ Here's some examples to get you started with the Ruby API:
   site.schedule_host_check('myhost')
 
   # get details on all services
-  site.service_status
-
-  # or just things with problems
-  site.service_status(
-    :service_status_types => [
-      :critical,
-      :warning,
-      :unknown
-    ]
-  )
-
-  # or just muted services, sorted desc by duration
-  site.service_status(
-    :service_props => [
-      :notifications_disabled,
-    ],
-    :sort_type    => :descending,
-    :sort_option  => :state_duration,
-  )
-
+  site.service_status(:all)
+  # or just services that have problems 
+  site.service_status(:all_problems)
+  # (other valid symbols: :ok, :warning, :unknown, :critical, :pending, :all_problems)
+  # or make it sorted by  duration, descending
+  site.service_status(:all_problem, :sort_option => :duration, :sort_type => :desc
+  # (other sort_options: :host, :service, :status, :last_check, :duration, :attempts)
+  # (other sort_types: :asc, :desc)
   # or get the details for a single service group
-  site.service_status(:group => "AWESOME")
+  site.service_status(:all_problem, :group => "AWESOME")
 
   # schedule a host to have services checks run again right now
   site.schedule_service_check('myhost', 'myservice')
@@ -58,9 +46,6 @@ Here's some examples to get you started with the Ruby API:
   # or unacknowledge
   site.unacknowledge_service('myhost', 'myservice')
 
-  # acknowledge a down service
-  site.acknowledge_host('myhost', 'something bad happened')
-
   # disable notifications for a service:
   site.disable_service_notifications('myhost', 'myservice')
 
@@ -88,7 +73,7 @@ This will display all available commands.
 
 
 == Note on Patches/Pull Requests
-
+ 
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version unintentionally.

data/bin/nagiosharder

@@ -4,6 +4,5 @@ begin
   exit NagiosHarder::Cli.new(ARGV).run
 rescue ArgumentError => e
   puts e.message
-  puts e.backtrace.join("\n") if ENV['DEBUG']
   exit 1
 end

data/lib/nagiosharder.rb

@@ -3,7 +3,6 @@ require 'nokogiri'
 require 'active_support' # fine, we'll just do all of activesupport instead of the parts I want. thank Rails 3 for shuffling requires around.
 require 'cgi'
 require 'hashie'
-require 'nagiosharder/filters'
 
 # :(
 require 'active_support/version' # double and triplely ensure ActiveSupport::VERSION is around
@@ -25,28 +24,25 @@ class NagiosHarder
     attr_accessor :nagios_url, :user, :password, :default_options, :default_cookies, :version, :nagios_time_format
     include HTTParty::ClassMethods
 
-    def initialize(nagios_url, user, password, version = 3, nagios_time_format = nil)
+    def initialize(nagios_url, user, password, version = 3)
       @nagios_url = nagios_url.gsub(/\/$/, '')
       @user = user
       @password = password
       @default_options = {}
       @default_cookies = {}
       @version = version
-      debug_output if ENV['DEBUG']
       basic_auth(@user, @password) if @user && @password
-      @nagios_time_format = if nagios_time_format == 'us'
-         "%m-%d-%Y %H:%M:%S"
-      else
-        if @version.to_i < 3
-          "%m-%d-%Y %H:%M:%S"
-        else
-          "%Y-%m-%d %H:%M:%S"
-        end
-      end
-      self
+
+      @nagios_time_format = if @version.to_i < 3
+                              "%m-%d-%Y %H:%M:%S"
+                            else
+                              "%Y-%m-%d %H:%M:%S"
+                            end
     end
 
     def acknowledge_service(host, service, comment)
+      # extra options: sticky_arg, send_notification, persistent
+
       request = {
         :cmd_typ => 34,
         :cmd_mod => 2,
@@ -63,22 +59,6 @@ class NagiosHarder
       response.code == 200 && response.body =~ /successful/
     end
 
-    def acknowledge_host(host, comment)
-      request = {
-        :cmd_typ => 33,
-        :cmd_mod => 2,
-        :com_author => @user,
-        :com_data => comment,
-        :host => host,
-        :send_notification => true,
-        :persistent => false,
-        :sticky_ack => true
-      }
-
-      response = post(cmd_url, :body => request)
-      response.code == 200 && response.body =~ /successful/
-    end
-
     def unacknowledge_service(host, service)
       request = {
         :cmd_typ => 52,
@@ -190,42 +170,57 @@ class NagiosHarder
       response.code == 200 && response.body =~ /successful/
     end
 
-    def service_status(options = {})
-      params = {}
-
-      {
-        :host_status_types    => :notification_host,
-        :service_status_types => :notification_service,
-        :sort_type            => :sort,
-        :sort_option          => :sort,
-        :host_props           => :host,
-        :service_props        => :service,
-      }.each do |key, val|
-        if options[key] && (options[key].is_a?(Array) || options[key].is_a?(Symbol))
-          params[key.to_s.gsub(/_/, '')] = Nagiosharder::Filters.value(val, *options[key])
-        end
-      end
-
-      # if any of the standard filter params are already integers, those win
-      %w(
-        :hoststatustypes,
-        :servicestatustypes,
-        :sorttype,
-        :sortoption,
-        :hostprops,
-        :serviceprops,
-      ).each do |key|
-        params[key.to_s] = options[:val] if !options[:val].nil? && options[:val].match(/^\d*$/)
-      end
+    def service_status(type, options = {})
+      service_status_type = case type
+                            when :ok then 2
+                            when :warning then 4
+                            when :unknown then 8
+                            when :critical then 16
+                            when :pending then 1
+                            when :all_problems then 28
+                            when :all then nil
+                            else
+                              raise "Unknown type"
+                            end
+
+      sort_type = case options[:sort_type]
+                  when :asc then 1
+                  when :desc then 2
+                  when nil then nil
+                  else
+                    raise "Invalid options[:sort_type]"
+                  end
+
+      sort_option = case options[:sort_option]
+                    when :host then 1
+                    when :service then 2
+                    when :status then 3
+                    when :last_check then 4
+                    when :duration then 6
+                    when :attempts then 5
+                    when nil then nil
+                    else
+                      raise "Invalid options[:sort_option]"
+                    end
+
+      service_group = options[:group]
+
+
+      params = {
+        'hoststatustype' => options[:hoststatustype] || 15,
+        'servicestatustypes' => options[:servicestatustypes] || service_status_type,
+        'sorttype' => options[:sorttype] || sort_type,
+        'sortoption' => options[:sortoption] || sort_option,
+        'hoststatustypes' => options[:hoststatustypes],
+        'serviceprops' => options[:serviceprops]
+      }
 
       if @version == 3
-        params['servicegroup'] = options[:group] || 'all'
+        params['servicegroup'] = service_group || 'all'
         params['style'] = 'detail'
-        params['embedded'] = '1'
-        params['noheader'] = '1'
       else
-        if options[:group]
-          params['servicegroup'] = options[:group]
+        if service_group
+          params['servicegroup'] = service_group
           params['style'] = 'detail'
         else
           params['host'] = 'all'
@@ -247,7 +242,7 @@ class NagiosHarder
     end
 
     def host_status(host)
-      host_status_url = "#{status_url}?host=#{host}&embedded=1&noheader=1"
+      host_status_url = "#{status_url}?host=#{host}"
       response =  get(host_status_url)
 
       raise "wtf #{host_status_url}? #{response.code}" unless response.code == 200
@@ -344,7 +339,6 @@ class NagiosHarder
         columns = Nokogiri::HTML(row.inner_html).css('body > td').to_a
         if columns.any?
 
-          # Host column
           host = columns[0].inner_text.gsub(/\n/, '')
 
           # for a given host, the host details are blank after the first row
@@ -355,9 +349,7 @@ class NagiosHarder
             # or save it for later
             host = last_host
           end
-          debug 'parsed host column'
 
-          # Service Column
           if columns[1]
             service_links = columns[1].css('td a')
             service_link, other_links = service_links[0], service_links[1..-1]
@@ -388,21 +380,13 @@ class NagiosHarder
 
             service = service_links[0].inner_html
           end
-          debug 'parsed service column'
 
-          # Status
           status = columns[2].inner_html  if columns[2]
-          debug 'parsed status column'
-
-          # Last Check
           last_check = if columns[3] && columns[3].inner_html != 'N/A'
                          last_check_str = columns[3].inner_html
-                         debug "Need to parse #{columns[3].inner_html} in #{nagios_time_format}"
+
                          DateTime.strptime(columns[3].inner_html, nagios_time_format).to_s
                        end
-          debug 'parsed last check column'
-
-          # Duration
           duration = columns[4].inner_html.squeeze(' ').gsub(/^ /, '') if columns[4]
           started_at = if duration && match_data = duration.match(/^\s*(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s\s*$/)
                          (
@@ -412,16 +396,8 @@ class NagiosHarder
                            match_data[4].to_i.seconds
                          ).ago
                        end
-          debug 'parsed duration column'
-
-          # Attempts
           attempts = columns[5].inner_html if columns[5]
-          debug 'parsed attempts column'
-
-          # Status info
-          status_info = columns[6].inner_html.gsub('&nbsp;', '').gsub("\302\240", '') if columns[6]
-          debug 'parsed status info column'
-
+          status_info = columns[6].inner_html.gsub('&nbsp;', '') if columns[6]
 
           if host && service && status && last_check && duration && attempts && started_at && status_info
             service_extinfo_url = "#{extinfo_url}?type=2&host=#{host}&service=#{CGI.escape(service)}"
@@ -451,9 +427,6 @@ class NagiosHarder
       nil
     end
 
-    def debug(*args)
-      $stderr.puts *args if ENV['DEBUG']
-    end
-
   end
+
 end

data/lib/nagiosharder/cli.rb

@@ -23,12 +23,8 @@ class NagiosHarder
           end.map { |name, s| s }
         end
         true
-      when /^(ack|acknowledged)$/
-        if service.nil?
-          client.acknowledge_host(host, the_rest.join(' '))
-        else
-          client.acknowledge_service(host, service, the_rest.join(' '))
-        end
+      when /^ack/
+        client.acknowledge_service(host, service, the_rest.join(' '))
       when /^unack/
         client.unacknowledge_service(host, service)
       when /^(mute|disable_notifications)$/
@@ -49,82 +45,23 @@ class NagiosHarder
         end
       when 'problems'
         service_table do
-          params = {
-            :service_status_types => [:critical, :warning, :unknown],
-          }
-          params[:group] = param
-          client.service_status(params)
-        end
-        true
-      when /^(critical|warning|unknown)/
-        service_table do
-          params = {
-            :service_status_types => [
-              $1,
-            ],
-            :service_props => [
-              :hard_state,
-              :no_scheduled_downtime,
-              :state_unacknowledged,
-              :notifications_enabled
-            ]
-          }
-          params[:group] = param
-          client.service_status(params)
+          if param
+            client.service_status(:all_problems, :group => param)
+          else
+            client.service_status(:all_problems)
+          end
         end
         true
       when /^(triage|unhandled)/
         service_table do
-          params = {
-            :service_status_types => [
-              :critical,
-              :warning,
-              :unknown
-            ],
-            :host_props => [
-              :no_scheduled_downtime,
-              :state_unacknowledged,
-              :notifications_enabled
-            ],
-            :service_props => [
-              :no_scheduled_downtime,
-              :state_unacknowledged,
-              :notifications_enabled
-            ]
-          }
-          params[:group] = param
-          client.service_status(params)
-        end
-        true
-      when /^muted/
-        service_table do
-          params = {
-            :service_props => [
-              :notifications_disabled,
-            ]
-          }
-          params[:group] = param
-          client.service_status(params)
-        end
-        true
-      when /^(acked|acknowledged)/
-        service_table do
-          params = {
-            :service_status_types => [
-              :critical,
-              :warning,
-              :unknown
-            ],
-            :service_props => [
-              :state_acknowledged,
-            ]
-          }
-          params[:group] = param
-          client.service_status(params)
+          if param
+            client.service_status(:all_problems, :group => param, :hoststatustypes => 3, :serviceprops => 42, :servicestatustypes => 28)
+          else
+            client.service_status(:all_problems, :hoststatustypes => 3, :serviceprops => 42, :servicestatustypes => 28)
+          end
         end
         true
       else
-        debug "'#{command}'"
         raise ArgumentError, help
       end
       if return_value
@@ -138,8 +75,7 @@ class NagiosHarder
     protected
 
     def client
-      debug "loading client with options #{options.inspect}"
-      @client ||= NagiosHarder::Site.new(options['nagios_url'], options['user'], options['password'], options['version'], options['time'])
+      @client ||= NagiosHarder::Site.new(options['nagios_url'], options['user'], options['password'], options['version'])
     end
 
     def parse_connection_options(argv)
@@ -170,12 +106,8 @@ class NagiosHarder
           options['nagios_url'] = nagios_url
         end
 
-        opts.on( '-v', '--version [3]', 'Nagios version (2 or 3, defaults to 3)') do |version|
-          options['version'] = version
-        end
-
-        opts.on( '-t', '--time [us|euro]', 'Nagios time format') do |time|
-          options['time'] = time
+        opts.on( '-v', '--version [3]', 'Nagios version (2 or 3, defaults to 3)') do |nagios_url|
+          options['version'] = nagios_url
         end
 
       end
@@ -222,10 +154,6 @@ class NagiosHarder
         "\\1\\3\n")
     end
 
-    def debug(*args)
-      $stderr.puts *args if ENV['DEBUG']
-    end
-
     def help
       help = <<-HELP
 NagiosHarder
@@ -242,8 +170,6 @@ COMMANDS:
     nagiosharder status aux1
     nagiosharder status aux1/http
 
-    nagiosharder acknowledge aux1 [message]
-
     nagiosharder acknowledge aux1/http [message]
     nagiosharder ack aux1/http [message]
 
@@ -258,7 +184,7 @@ COMMANDS:
     nagiosharder unmute aux1/http
     nagiosharder enable_notifications aux1/http
 
-    nagiosharder check aux1/http
+    nagios check aux1/http
 
     nagiosharder downtime aux1 15
     nagiosharder downtime aux1/http 15
@@ -266,12 +192,6 @@ COMMANDS:
     nagiosharder problems
     nagiosharder problems http-services
 
-    nagiosharder acknowledged
-    nagiosharder acked http-services
-
-    nagiosharder muted
-    nagiosharder muted http-services
-
     nagiosharder triage
     nagiosharder unhandled
     nagiosharder unhandled http-services

data/nagiosharder.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "nagiosharder"
-  s.version     = "0.4.0.rc1"
+  s.version     = "0.4.0"
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Josh Nichols", "Jesse Newland"]
-  s.email       = ["josh@technicalpickles.com", "jesse@github.com"]
+  s.authors     = ["Josh Nichols"]
+  s.email       = ["josh@technicalpickles.com"]
   s.homepage    = "http://github.com/railsmachine/nagiosharder"
   s.summary     = %q{Nagios access at your ruby fingertips}
   s.description = %q{Nagios access at your ruby fingertips}
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport'
   s.add_dependency 'i18n'
   s.add_dependency 'terminal-table'
-  s.add_dependency 'httparty', '~> 0.8.3'
-  s.add_dependency 'hashie', '~> 1.2.0'
+  s.add_dependency 'httparty', '~> 0.6.1'
+  s.add_dependency 'hashie', '~> 1.0.0'
   s.add_development_dependency "rspec", ">= 1.2.9"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,154 +1,153 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: nagiosharder
-version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 15
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
-authors:
+authors: 
 - Josh Nichols
-- Jesse Newland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-23 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: terminal-table
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: httparty
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: hashie
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.9
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
+  type: :development
+  version_requirements: *id008
 description: Nagios access at your ruby fingertips
-email:
+email: 
 - josh@technicalpickles.com
-- jesse@github.com
-executables:
+executables: 
 - nagiosharder
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .document
 - .gitignore
 - Gemfile
@@ -159,30 +158,40 @@ files:
 - bin/nagiosharder
 - lib/nagiosharder.rb
 - lib/nagiosharder/cli.rb
-- lib/nagiosharder/filters.rb
 - nagiosharder.gemspec
+has_rdoc: true
 homepage: http://github.com/railsmachine/nagiosharder
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: nagiosharder
-rubygems_version: 1.8.23
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Nagios access at your ruby fingertips
 test_files: []
+

data/lib/nagiosharder/filters.rb

@@ -1,140 +0,0 @@
-module Nagiosharder
-  module Filters
-
-    # irb> Nagiosharder::Filters.value(:host)
-    # => 0
-    # irb> Nagiosharder::Filters.value(:host, :state_acknowledged)
-    # => 4
-    # irb> Nagiosharder::Filters.value(:host, :state_acknowledged, :checks_disabled)
-    # => 20
-    def self.value(type, *args)
-      args.each.inject(0) do |i, arg|
-        begin
-          i += const_get("#{type}_#{arg}".upcase)
-        rescue NameError
-          i
-        end
-      end
-    end
-
-    #/********************* EXTENDED INFO CGI DISPLAY TYPES  *********************/
-
-    DISPLAY_PROCESS_INFO=0
-    DISPLAY_HOST_INFO=1
-    DISPLAY_SERVICE_INFO=2
-    DISPLAY_COMMENTS=3
-    DISPLAY_PERFORMANCE=4
-    DISPLAY_HOSTGROUP_INFO=5
-    DISPLAY_DOWNTIME=6
-    DISPLAY_SCHEDULING_QUEUE=7
-    DISPLAY_SERVICEGROUP_INFO=8
-
-
-    #/************************ COMMAND CGI COMMAND MODES *************************/
-
-    CMDMODE_NONE=0
-    CMDMODE_REQUEST=1
-    CMDMODE_COMMIT=2
-
-
-
-    #/******************** HOST AND SERVICE NOTIFICATION TYPES ******************/
-
-    NOTIFICATION_ALL=0 #/* all service and host notifications */
-    NOTIFICATION_SERVICE_ALL=1 #/* all types of service notifications */
-    NOTIFICATION_HOST_ALL=2 #/* all types of host notifications */
-    NOTIFICATION_SERVICE_WARNING=4
-    NOTIFICATION_SERVICE_UNKNOWN=8
-    NOTIFICATION_SERVICE_CRITICAL=16
-    NOTIFICATION_SERVICE_RECOVERY=32
-    NOTIFICATION_HOST_DOWN=64
-    NOTIFICATION_HOST_UNREACHABLE=128
-    NOTIFICATION_HOST_RECOVERY=256
-    NOTIFICATION_SERVICE_ACK=512
-    NOTIFICATION_HOST_ACK=1024
-    NOTIFICATION_SERVICE_FLAP=2048
-    NOTIFICATION_HOST_FLAP=4096
-    NOTIFICATION_SERVICE_CUSTOM=8192
-    NOTIFICATION_HOST_CUSTOM=16384
-
-
-    #/********************** HOST AND SERVICE ALERT TYPES **********************/
-
-    HISTORY_ALL=0 #/* all service and host alert */
-    HISTORY_SERVICE_ALL=1 #/* all types of service alerts */
-    HISTORY_HOST_ALL=2 #/* all types of host alerts */
-    HISTORY_SERVICE_WARNING=4
-    HISTORY_SERVICE_UNKNOWN=8
-    HISTORY_SERVICE_CRITICAL=16
-    HISTORY_SERVICE_RECOVERY=32
-    HISTORY_HOST_DOWN=64
-    HISTORY_HOST_UNREACHABLE=128
-    HISTORY_HOST_RECOVERY=256
-
-
-    #/****************************** SORT TYPES  *******************************/
-
-    SORT_NONE=0
-    SORT_ASCENDING=1
-    SORT_DESCENDING=2
-
-
-    #/***************************** SORT OPTIONS  ******************************/
-
-    SORT_NOTHING=0
-    SORT_HOSTNAME=1
-    SORT_SERVICENAME=2
-    SORT_SERVICESTATUS=3
-    SORT_LASTCHECKTIME=4
-    SORT_CURRENTATTEMPT=5
-    SORT_STATEDURATION=6
-    SORT_NEXTCHECKTIME=7
-    SORT_HOSTSTATUS=8
-    SORT_HOSTURGENCY=9
-
-
-    #/****************** HOST AND SERVICE FILTER PROPERTIES  *******************/
-
-    HOST_SCHEDULED_DOWNTIME=1
-    HOST_NO_SCHEDULED_DOWNTIME=2
-    HOST_STATE_ACKNOWLEDGED=4
-    HOST_STATE_UNACKNOWLEDGED=8
-    HOST_CHECKS_DISABLED=16
-    HOST_CHECKS_ENABLED=32
-    HOST_EVENT_HANDLER_DISABLED=64
-    HOST_EVENT_HANDLER_ENABLED=128
-    HOST_FLAP_DETECTION_DISABLED=256
-    HOST_FLAP_DETECTION_ENABLED=512
-    HOST_IS_FLAPPING=1024
-    HOST_IS_NOT_FLAPPING=2048
-    HOST_NOTIFICATIONS_DISABLED=4096
-    HOST_NOTIFICATIONS_ENABLED=8192
-    HOST_PASSIVE_CHECKS_DISABLED=16384
-    HOST_PASSIVE_CHECKS_ENABLED=32768
-    HOST_PASSIVE_CHECK=65536
-    HOST_ACTIVE_CHECK=131072
-    HOST_HARD_STATE=262144
-    HOST_SOFT_STATE=524288
-
-    SERVICE_SCHEDULED_DOWNTIME=1
-    SERVICE_NO_SCHEDULED_DOWNTIME=2
-    SERVICE_STATE_ACKNOWLEDGED=4
-    SERVICE_STATE_UNACKNOWLEDGED=8
-    SERVICE_CHECKS_DISABLED=16
-    SERVICE_CHECKS_ENABLED=32
-    SERVICE_EVENT_HANDLER_DISABLED=64
-    SERVICE_EVENT_HANDLER_ENABLED=128
-    SERVICE_FLAP_DETECTION_ENABLED=256
-    SERVICE_FLAP_DETECTION_DISABLED=512
-    SERVICE_IS_FLAPPING=1024
-    SERVICE_IS_NOT_FLAPPING=2048
-    SERVICE_NOTIFICATIONS_DISABLED=4096
-    SERVICE_NOTIFICATIONS_ENABLED=8192
-    SERVICE_PASSIVE_CHECKS_DISABLED=16384
-    SERVICE_PASSIVE_CHECKS_ENABLED=32768
-    SERVICE_PASSIVE_CHECK=65536
-    SERVICE_ACTIVE_CHECK=131072
-    SERVICE_HARD_STATE=262144
-    SERVICE_SOFT_STATE=524288
-  end
-end