auxesis-flapjack 0.4.5 → 0.4.6

data/TODO.md

@@ -7,12 +7,22 @@
    * update status of checks - DONE
    * relationships + cascading notifications - DONE
    * simple graphs
+   * event/result history
+ * build option to specify notifier(s) directory
  * documentation!
    * user
    * developer
+   * step-by-step install guide
+   * scaling guide
+   * integrating with collectd guide
+   * writing custom populators guide
+ * write puppet manifests
+ * write chef cookbooks
  * package with pallet
  * generate .deb/.rpms
    * build packages for gem dependencies
+ * sandbox flapjack-worker
+   * provide config option for specifying sandbox dir
  * provide common interface for loading checks into beanstalk
  * write check generator
    * include a collection of common functions 

data/flapjack.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'flapjack'
-  s.version = '0.4.5'
-  s.date = '2009-06-30'
+  s.version = '0.4.6'
+  s.date = '2009-07-14'
   
   s.summary = "a scalable and distributed monitoring system"
   s.description = "Flapjack is highly scalable and distributed monitoring system. It understands the Nagios plugin format, and can easily be scaled from 1 server to 1000."

data/lib/flapjack/cli/notifier.rb

@@ -6,6 +6,8 @@ require 'optparse'
 require 'log4r'
 require 'log4r/outputter/syslogoutputter'
 require File.join(File.dirname(__FILE__), '..', 'database')
+require File.join(File.dirname(__FILE__), '..', 'notifier')
+require File.join(File.dirname(__FILE__), '..', 'result')
 
 module Flapjack
   class NotifierOptions
@@ -152,12 +154,13 @@ module Flapjack
       raise ArgumentError, "notifiers directory doesn't exist!" unless File.exists?(notifiers_directory)
       
       @notifiers = []
-     
+    
       @config.notifiers.each_pair do |notifier, config|
         filename = File.join(notifiers_directory, notifier.to_s, 'init')
         if File.exists?(filename + '.rb')
           @log.debug("Loading the #{notifier.to_s.capitalize} notifier")
           require filename
+          config.merge!(:logger => @log, :website_uri => @config.website_uri)
           @notifiers << Flapjack::Notifiers.const_get("#{notifier.to_s.capitalize}").new(config)
         else
           @log.warning("Flapjack::Notifiers::#{notifier.to_s.capitalize} doesn't exist!") 
@@ -214,7 +217,7 @@ module Flapjack
     def process_result
       @log.debug("Waiting for new result...")
       result_job = @results_queue.reserve # blocks until a job is reserved
-      result = Result.new(YAML::load(result_job.body))
+      result = Flapjack::Result.new(YAML::load(result_job.body))
       
       @log.info("Processing result for check '#{result.id}'")
       if result.warning? || result.critical?

data/lib/flapjack/notifiers/mailer/mailer.rb

@@ -11,6 +11,9 @@ module Flapjack
 
       def initialize(opts={})
         @from_address = opts[:from_address]
+        @website_uri  = opts[:website_uri].gsub(/\/$/, '')
+        @log = opts[:logger]
+        @log ||= Log4r::Logger.new("notifier")
       end
 
       def notify(opts={})
@@ -27,11 +30,15 @@ module Flapjack
             #{opts[:result].output}
     
           You can respond to this issue at:
-            http://localhost:4000/issue/#{opts[:result].object_id * -1}
+            #{@website_uri}/issue/#{opts[:result].id}
         DESC
-    
-        Net::SMTP.start('localhost') do |smtp|
-          smtp.sendmail(mail.to_s, mail.from, mail.to)
+
+        begin 
+          Net::SMTP.start('localhost') do |smtp|
+            smtp.sendmail(mail.to_s, mail.from, mail.to)
+          end
+        rescue Errno::ECONNREFUSED
+          @log.error("Couldn't establish connection to mail server!")
         end
       end
     

data/lib/flapjack/result.rb

@@ -9,37 +9,39 @@ require 'ostruct'
 #
 # Convenience methods are used by the Notifier to determine whether a 
 # notification needs to be sent out.
-class Result < OpenStruct
-
-  # Whether a check returns an ok status. 
-  def ok?
-    self.retval == 0
-  end
-
-  # Whether a check has a warning status.
-  def warning?
-    self.retval == 1
-  end
-
-  # Whether a check has a critical status.
-  def critical?
-    self.retval == 2
-  end
-
-  # Human readable representation of the check's return value.
-  def status
-    case self.retval
-    when 0 ; "ok"
-    when 1 ; "warning"
-    when 2 ; "critical"
+module Flapjack
+  class Result < OpenStruct
+  
+    # Whether a check returns an ok status. 
+    def ok?
+      self.retval == 0
     end
+  
+    # Whether a check has a warning status.
+    def warning?
+      self.retval == 1
+    end
+  
+    # Whether a check has a critical status.
+    def critical?
+      self.retval == 2
+    end
+  
+    # Human readable representation of the check's return value.
+    def status
+      case self.retval
+      when 0 ; "ok"
+      when 1 ; "warning"
+      when 2 ; "critical"
+      end
+    end
+  
+    # The id of a check result.
+    def id
+      # openstruct won't respond, so we have to manually define it
+      @table[:id]
+    end
+  
   end
-
-  # The id of a check result.
-  def id
-    # openstruct won't respond, so we have to manually define it
-    @table[:id]
-  end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auxesis-flapjack
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency