flapjack 0.4.11 → 0.4.12

data/TODO.md

@@ -1,5 +1,21 @@
  * create events for failed checks
- * build option to specify notifier(s) directory
+
+ * rethink Notifier/NotifierCLI split
+   Notifier + NotifierCLI are tightly coupled, which makes it difficult to refactor
+   follow Puppet's lead with Puppet::Application (NotifierCLI translates to Flapjack::Notifier::Application)
+   implement simple interface application interface => Flapjack::Notifier::Application.run(options)
+
+
+ * reduce notifier dependencies (e.g. xmpp4r over xmpp4r-simple)
+ * make notification/escalation logic pluggable (to reduce packaging dependencies)
+
+ * release Flapjack as a distribution-consumable tarball
+ * automate building of release tarball that optionally pulls in dependencies
+ * add lintian-like checks for verifying packagability (see http://pkg-ruby-extras.alioth.debian.org/upstream-devs.html)
+ 
+ * build benchmarks for flapjack-{worker,notifier}
+
+ * setup wiki.flapjack-project.com
  * documentation!
    * user
    * developer
@@ -7,20 +23,31 @@
    * scaling guide
    * integrating with collectd guide
    * writing custom populators guide
- * build benchmarks for flapjack-{worker,notifier}
  * write puppet manifests
- * package with pallet
- * generate .deb/.rpms
-   * build packages for gem dependencies
+ 
+ * build option to specify notifier(s) directory
  * sandbox flapjack-worker
    * provide config option for specifying sandbox dir
+
  * provide common interface for loading checks into beanstalk (extract from populator)
- * write check generator
-   * include a collection of common functions 
-     (logging to rrd, retreiving values, executing check)
+ * make message queueing interface more abstract (support for AMQP/RabbitMQ)
+ 
  * write zeroconf/avahi notifier
  * write growl notifier
- * write way to customise notifier messages (email body, xmpp format)
  * write sms notifier
- * patch beanstalk-client to recognise DRAINING status 
+ * write way to customise notifier messages (email body, xmpp format)
+
  * http://www.kitchensoap.com/2009/10/05/meanwhile-more-meta-metrics/
+
+ * write beanstalkd.yreserve to simplify code
+ * write beanstalkd.jput, beanstalkd.jreserve for native json api
+ 
+ * add support to worker and notifier for multiple beanstalkds
+
+ * write check generator
+   * include a collection of common functions 
+     (logging to rrd, retreiving values, executing check)
+ * patch beanstalk-client to recognise DRAINING status 
+
+
+

data/flapjack.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'flapjack'
-  s.version = '0.4.11'
-  s.date = '2009-10-24'
+  s.version = '0.4.12'
+  s.date = '2009-11-22'
   
   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."
@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.homepage = 'http://flapjack-project.com'
   s.has_rdoc = false
 
-  s.add_dependency('daemons', '>= 1.0.10')
-  s.add_dependency('beanstalk-client', '>= 1.0.2')
-  s.add_dependency('log4r', '>= 1.0.5')
-  s.add_dependency('xmpp4r-simple', '>= 0.8.8')
-  s.add_dependency('mailfactory', '>= 1.4.0')
+  s.add_dependency('daemons', '= 1.0.10')
+  s.add_dependency('beanstalk-client', '= 1.0.2')
+  s.add_dependency('log4r', '= 1.0.5')
+  s.add_dependency('xmpp4r', '= 0.5')
+  s.add_dependency('tmail', '= 1.2.3.1')
   s.add_dependency('dm-core', '= 0.9.11')
   s.add_dependency('dm-timestamps', '= 0.9.11')
   s.add_dependency('dm-types', '= 0.9.11')

data/lib/flapjack/cli/notifier.rb

@@ -224,13 +224,14 @@ module Flapjack
         if any_parents_warning_or_critical?(result)
           @log.info("Not notifying on check '#{result.id}' as parent is failing.")
         else
+          @log.info("Creating event for check '#{result.id}'")
+          # FIXME: this will be a performance hit
+          event = ::Event.new(:check_id => result.id)
+          raise unless event.save
+        
           @log.info("Notifying on check '#{result.id}'")
-          @notifier.notify!(result)
+          @notifier.notify!(result, event)
         end
-        
-        @log.info("Creating event for check '#{result.id}'")
-        event = Event.new(:check_id => result.id)
-        raise unless event.save
       end
 
       @log.info("Storing status of check in database")

data/lib/flapjack/notifier.rb

@@ -22,12 +22,13 @@ module Flapjack
         @log.warning("there are no notifiers")
       end
     end
-    
-    def notify!(result)
+   
+    # FIXME: use opts={} convention
+    def notify!(result, event)
       @notifiers.each do |n|
         @recipients.each do |recipient|
           @log.info("Notifying #{recipient.name} via #{n.class} about check #{result.id}")
-          n.notify(:result => result, :who => recipient)
+          n.notify(:result => result, :who => recipient, :event => event)
         end
       end
     end

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

@@ -2,7 +2,8 @@
 
 require 'rubygems'
 require 'net/smtp'
-require 'mailfactory'
+require 'tmail'
+require 'log4r'
 
 module Flapjack
   module Notifiers
@@ -10,20 +11,25 @@ module Flapjack
     class Mailer
 
       def initialize(opts={})
-        @from_address = opts[:from_address]
+        if opts[:from_address]
+          @from_address = opts[:from_address]
+        else
+          raise ArgumentError, "from address must be provided"
+        end
         @website_uri  = opts[:website_uri] ? opts[:website_uri].gsub(/\/$/, '') : "http://#{`hostname`}"
         @log = opts[:logger]
-        @log ||= Log4r::Logger.new("notifier")
+        @log ||= ::Log4r::Logger.new("notifier")
       end
 
       def notify(opts={})
-        raise unless (opts[:who] && opts[:result])
+        raise ArgumentError, "a recipient was not specified" unless opts[:who]
+        raise ArgumentError, "a result was not specified" unless opts[:result]
     
-        mail = MailFactory.new
+        mail = TMail::Mail.new
         mail.to = opts[:who].email
         mail.from = @from_address
         mail.subject = "Check: #{opts[:result].id}, Status: #{opts[:result].status}"
-        mail.text = <<-DESC
+        mail.body = <<-DESC
           Check #{opts[:result].id} returned the status "#{opts[:result].status}".
           
           Here was the output: 
@@ -35,7 +41,7 @@ module Flapjack
 
         begin 
           Net::SMTP.start('localhost') do |smtp|
-            smtp.sendmail(mail.to_s, mail.from, mail.to)
+            return smtp.sendmail(mail.to_s, mail.from, mail.to)
           end
         rescue Errno::ECONNREFUSED
           @log.error("Couldn't establish connection to mail server!")

data/lib/flapjack/notifiers/xmpp/xmpp.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'xmpp4r-simple'
+require 'xmpp4r'
 
 module Flapjack
   module Notifiers
@@ -16,7 +16,9 @@ module Flapjack
         end
 
         begin 
-          @xmpp = Jabber::Simple.new(@jid, @password)
+          @xmpp = Jabber::Client.new(@jid)
+          @xmpp.connect
+          @xmpp.auth(@password)
         rescue SocketError => e
           @log.error("XMPP: #{e.message}")
         end
@@ -25,14 +27,16 @@ module Flapjack
     
       def notify(opts={})
     
-        raise unless opts[:who] && opts[:result]
+        raise ArgumentError, "a recipient was not specified" unless opts[:who] 
+        raise ArgumentError, "a result was not specified" unless opts[:result]
     
-        message = <<-DESC
+        text = <<-DESC
           Check #{opts[:result].id} returned the status "#{opts[:result].status}".
             http://localhost:4000/checks/#{opts[:result].id}
         DESC
-    
-        @xmpp.deliver(opts[:who].jid, message)
+   
+        message = Jabber::Message.new(opts[:who].jid, text)
+        @xmpp.send(message)
     
       end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flapjack
 version: !ruby/object:Gem::Version 
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-24 00:00:00 +02:00
+date: 2009-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.0.10
     version: 
@@ -28,7 +28,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.0.2
     version: 
@@ -38,29 +38,29 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.0.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: xmpp4r-simple
+  name: xmpp4r
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.8
+        version: "0.5"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mailfactory
+  name: tmail
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.2.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-core