nagiosharder 0.1.2 → 0.1.3

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "nagiosharder"
-    gem.version = "0.1.2"
+    gem.version = "0.1.3"
     gem.summary = %Q{Nagios access at your ruby fingertips}
     gem.description = %Q{Nagios access at your ruby fingertips}
     gem.email = "josh@technicalpickles.com"
@@ -15,6 +15,7 @@ begin
     gem.add_dependency 'nokogiri', '~> 1.4.3'
     gem.add_dependency 'activesupport'
     gem.add_dependency 'httparty', '~> 0.6.1'
+    gem.add_dependency 'hashie', '~> 1.0.0'
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/lib/nagiosharder.rb

@@ -1,6 +1,8 @@
 require 'restclient'
 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 'active_support/version' # double and triplely ensure ActiveSupport::VERSION is around
@@ -60,6 +62,37 @@ class NagiosHarder
       response.code == 200 && response.body =~ /successful/
     end
 
+    def schedule_service_downtime(host, service, options = {})
+      request = {
+        :cmd_mod => 2,
+        :cmd_typ => 56,
+        :com_author => options[:author] || "#{@user} via nagiosharder",
+        :com_data => options[:comment] || 'scheduled downtime by nagiosharder',
+        :host => host,
+        :service => service,
+        :trigger => 0
+      }
+
+      request[:fixed] = case options[:type].to_sym
+                        when :fixed then 1
+                        when :flexible then 0
+                        else 1
+                        end
+
+
+     if request[:fixed] == 0
+        request[:hours]   = options[:hours]
+        request[:minutes] = options[:minutes]
+      end
+
+      request[:start_time] = formatted_time_for(options[:start_time])
+      request[:end_time]   = formatted_time_for(options[:end_time])
+
+      response = post(cmd_url, :body => request)
+
+      response.code == 200 && response.body =~ /successful/
+    end
+
     def schedule_host_downtime(host, options = {})
       request = {
         :cmd_mod => 2,
@@ -73,13 +106,13 @@ class NagiosHarder
 
       # FIXME we could use some option checking...
 
-      request[:type] = case options[:type].to_sym
-                       when :fixed then 1
-                       when :flexible then 0
-                       else 1 # default to fixed
-                       end
+      request[:fixed] = case options[:type].to_sym
+                        when :fixed then 1
+                        when :flexible then 0
+                        else 1 # default to fixed
+                        end
 
-      if request[:type] == 0
+      if request[:fixed] == 0
         request[:hours]   = options[:hours]
         request[:minutes] = options[:minutes]
       end
@@ -223,6 +256,10 @@ class NagiosHarder
       "#{nagios_url}/cmd.cgi"
     end
 
+    def extinfo_url
+      "#{nagios_url}/extinfo.cgi"
+    end
+
     private
 
 
@@ -275,19 +312,20 @@ class NagiosHarder
           attempts = columns[5].inner_html if columns[5]
           status_info = columns[6].inner_html.gsub(' ', '') if columns[6]
 
-          status = {
-            :host => host,
-            :service => service,
-            :status => status,
-            :last_check => last_check,
-            :duration => duration,
-            :attempts => attempts,
-            :started_at => started_at,
-            :extended_info => status_info,
-            :acknowledged => acknowledged
-          }
-
           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)}"
+
+            status = Hashie::Mash.new :host => host,
+              :service => service,
+              :status => status,
+              :last_check => last_check,
+              :duration => duration,
+              :attempts => attempts,
+              :started_at => started_at,
+              :extended_info => status_info,
+              :acknowledged => acknowledged,
+              :extinfo_url => service_extinfo_url
+
             yield status
           end
         end
@@ -297,4 +335,5 @@ class NagiosHarder
     end
     
   end
+
 end

data/nagiosharder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nagiosharder}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2011-01-25}
+  s.date = %q{2011-01-31}
   s.description = %q{Nagios access at your ruby fingertips}
   s.email = %q{josh@technicalpickles.com}
   s.extra_rdoc_files = [
@@ -45,12 +45,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.3"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, ["~> 0.6.1"])
+      s.add_runtime_dependency(%q<hashie>, ["~> 1.0.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rest-client>, ["~> 1.6.1"])
       s.add_dependency(%q<nokogiri>, ["~> 1.4.3"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<httparty>, ["~> 0.6.1"])
+      s.add_dependency(%q<hashie>, ["~> 1.0.0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, ["~> 1.4.3"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<httparty>, ["~> 0.6.1"])
+    s.add_dependency(%q<hashie>, ["~> 1.0.0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nagiosharder
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-01-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,9 +81,25 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: hashie
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,7 +111,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: Nagios access at your ruby fingertips
 email: josh@technicalpickles.com
 executables: []