nagios-manage 0.5.1 → 0.5.2

data/bin/check_check.rb

@@ -37,6 +37,9 @@ class Nagios::Status::Model
       hostinfo["servicestatus"].each do |name, status| 
         next if service_pattern and !service_pattern.match(name)
 
+        # Skip myself, if we are a check running from nagios.
+        next if name == ENV["NAGIOS_SERVICEDESC"]
+
         # Skip silenced or checks in scheduled downtime.
         next if status["notifications_enabled"].to_i == 0
         next if status["scheduled_downtime_depth"].to_i > 0
@@ -58,8 +61,7 @@ class Nagios::Status::Model
 
   def hosts(pattern=nil)
     if pattern
-      return @status.status["hosts"]
-      #.reject { |name,hostinfo| !pattern.match(name) }
+      return @status.status["hosts"].reject { |name,hostinfo| !pattern.match(name) }
     else
       return @status.status["hosts"]
     end # if pattern

data/lib/nagios/status.rb

@@ -228,14 +228,83 @@ module Nagios
 
         # Parses a servicestatus block
         def handle_contactstatus(lines)
+          @status['contacts'] ||= {}
+          contact = get_contact_name(lines)
+          @status['contacts'][contact] ||= {}
+          lines.each do |line|
+            match = line.match(/^\s*(.+)=(.*)$/)
+            @status['contacts'][contact][match[1]] = match[2] unless match[1] == 'contact_name'
+          end
         end
-
+        
+        def get_contact_name(lines)
+          if h = lines.grep(/\s+contact_name=(\w+)/).first
+            if h =~ /contact_name=(.*)$/
+              contact_name = $1
+            else
+              raise("Can't parse contact_name in block: #{h}")
+            end
+          else
+            raise("Can't parse contactstatus block")
+          end
+          return contact_name
+        end
+        
         # Parses a servicecomment block
         def handle_servicecomment(lines)
+          host = get_host_name(lines)
+          service = get_service_name(lines)
+          @status["hosts"][host]['servicecomments'] ||= {}
+          @status["hosts"][host]['servicecomments'][service] ||= []
+          comment = {}
+          lines.each do |line|            
+            match = line.match(/^\s*(.+)=(.*)$/)
+            comment[match[1]] = match[2] unless match[1] == 'service_name'
+          end
+          @status['hosts'][host]['servicecomments'][service] << comment
         end
 
         # Parses hostcomment block
         def handle_hostcomment(lines)
+          host = get_host_name(lines)
+          @status['hosts'][host]['hostcomments'] ||= []
+          comment = {}
+          lines.each do |line|
+            match = line.match(/^\s*(.+)=(.*)$/)
+            comment[match[1]] = match[2] unless match[1] == 'host_name'
+          end
+          @status['hosts'][host]['hostcomments'] << comment
+        end
+        
+        # Parses servicedowntime block
+        def handle_servicedowntime(lines)
+          host = get_host_name(lines)
+          service = get_service_name(lines)
+          downtime_id = get_downtime_id(lines)
+          @status["hosts"][host]["servicedowntime"] = {} unless @status["hosts"][host]["servicedowntime"]
+          @status["hosts"][host]["servicedowntime"][service] = downtime_id          
+        end
+        
+        # Parses hostdowntime block
+        def handle_hostdowntime(lines)
+          host = get_host_name(lines)
+          downtime_id = get_downtime_id(lines)
+          @status["hosts"][host]["hostdowntime"] = downtime_id
+        end
+        
+        # Parse the downtime_id out of a block
+        def get_downtime_id(lines)
+          if h = lines.grep(/\s+downtime_id=(.*)$/).first
+            if h =~ /downtime_id=(.+)$/
+              downtime_id = $1
+            else
+              raise("Can't parse downtime_id in block: #{h}")
+            end
+          else
+            raise("Can't find downtime_id in block")
+          end
+          
+          return downtime_id
         end
         
         # Parses a programstatus block

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nagios-manage
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - R.I. Pienaar, Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -08:00
+date: 2010-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: []