flapjack 0.6.38 → 0.6.39

data/flapjack.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
 
   # see http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
   # following a middle road here, not shipping it with the gem :)
-  gem.files         = `git ls-files`.split($\) - ['Gemfile.lock', 'bin/flapjack-bpimport']
+  gem.files         = `git ls-files`.split($\) - ['Gemfile.lock']
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "flapjack"
@@ -34,8 +34,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'blather'
   gem.add_dependency 'chronic'
   gem.add_dependency 'chronic_duration'
-  gem.add_dependency 'httparty'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'colorize'
 end

data/lib/flapjack/api.rb

@@ -283,7 +283,6 @@ module Flapjack
     end
 
     post '/contacts' do
-      begin
       pass unless 'application/json'.eql?(request.content_type)
       content_type :json
 
@@ -292,7 +291,7 @@ module Flapjack
 
       contacts = params[:contacts]
       if contacts && contacts.is_a?(Enumerable) && contacts.any? {|c| !c['id'].nil?}
-        Flapjack::Data::Contact.delete_all
+        Flapjack::Data::Contact.delete_all(:redis => @@redis)
         contacts.each do |contact|
           unless contact['id']
             logger.warn "Contact not imported as it has no id: #{contact.inspect}"
@@ -306,9 +305,6 @@ module Flapjack
         errors << "No valid contacts were submitted"
       end
       errors.empty? ? ret : [ret, {}, {:errors => [errors]}.to_json]
-    rescue Exception => e
-      puts e.message
-    end
     end
 
     not_found do

data/lib/flapjack/coordinator.rb

@@ -40,8 +40,7 @@ module Flapjack
     end
 
     def start(options = {})
-      # FIXME raise error if config not set, or empty
-
+      @signals = options[:signals]
       if options[:daemonize]
         daemonize
       else
@@ -75,7 +74,6 @@ module Flapjack
       end
 
       EM.synchrony do
-
         @logger.debug "config keys: #{@config.keys}"
 
         pikelet_keys = ['executive', 'jabber_gateway', 'pagerduty_gateway',
@@ -99,7 +97,7 @@ module Flapjack
           end
         end
 
-        setup_signals
+        setup_signals if @signals
       end
 
     end
@@ -126,10 +124,9 @@ module Flapjack
       end
       return unless pikelet_class
 
+      pikelet = pikelet_class.new
       f = Fiber.new {
         begin
-          pikelet = pikelet_class.new
-          @pikelets.detect {|p| p[:type] == pikelet_type}[:instance] = pikelet
           pikelet.bootstrap(:redis => @redis_options, :config => pikelet_cfg)
           pikelet.main
         rescue Exception => e
@@ -138,7 +135,7 @@ module Flapjack
           stop
         end
       }
-      @pikelets << {:fiber => f, :type => pikelet_type}
+      @pikelets << {:fiber => f, :type => pikelet_type, :instance => pikelet}
       f.resume
       @logger.debug "new fiber created for #{pikelet_type}"
     end
@@ -159,13 +156,13 @@ module Flapjack
 
       port = 3001 if (port.nil? || port <= 0 || port > 65535)
 
-      pool = Flapjack::RedisPool.new(:config => @redis_options)
-      pikelet_class.class_variable_set('@@redis', pool)
+      pikelet_class.class_variable_set('@@redis',
+        Flapjack::RedisPool.new(:config => @redis_options))
 
       Thin::Logging.silent = true
 
       pikelet = Thin::Server.new('0.0.0.0', port, pikelet_class, :signals => false)
-      @pikelets << {:instance => pikelet, :type => pikelet_type, :pool => pool}
+      @pikelets << {:instance => pikelet, :type => pikelet_type}
       pikelet.start
       @logger.debug "new thin server instance started for #{pikelet_type}"
     end
@@ -181,10 +178,11 @@ module Flapjack
 
       # set up connection pooling, stop resque errors (ensure that it's only
       # done once)
-      pool = nil
+      @resque_pool = nil
       if (['email_notifier', 'sms_notifier'] & @pikelets.collect {|p| p[:type]}).empty?
         pool = Flapjack::RedisPool.new(:config => @redis_options)
         ::Resque.redis = pool
+        @resque_pool = pool
         ## NB: can override the default 'resque' namespace like this
         #::Resque.redis.namespace = 'flapjack'
       end
@@ -210,14 +208,14 @@ module Flapjack
 
       pikelet_class.class_variable_set('@@config', pikelet_cfg)
 
+      # TODO error if pikelet_cfg['queue'].nil?
+      pikelet = EM::Resque::Worker.new(pikelet_cfg['queue'])
+      # # Use these to debug the resque workers
+      # pikelet.verbose = true
+      # pikelet.very_verbose = true
+
       f = Fiber.new {
         begin
-          # TODO error if pikelet_cfg['queue'].nil?
-          pikelet = EM::Resque::Worker.new(pikelet_cfg['queue'])
-          @pikelets.detect {|p| p[:type] == pikelet_type}[:instance] = pikelet
-          # # Use these to debug the resque workers
-          # flapjack_rsq.verbose = true
-          #flapjack_rsq.very_verbose = true
           pikelet.work(0.1)
         rescue Exception => e
           trace = e.backtrace.join("\n")
@@ -225,9 +223,7 @@ module Flapjack
           stop
         end
       }
-      pikelet_values = {:fiber => f, :type => pikelet_type}
-      pikelet_values[:pool] = pool if pool
-      @pikelets << pikelet_values
+      @pikelets << {:fiber => f, :type => pikelet_type, :instance => pikelet}
       f.resume
       @logger.debug "new fiber created for #{pikelet_type}"
     end
@@ -244,6 +240,8 @@ module Flapjack
     #   end
     # end
 
+    # TODO whem merged with other changes, have this check pik[:class] instead,
+    # makes tests neater
     def shutdown
       @pikelets.each do |pik|
         case pik[:instance]
@@ -278,15 +276,13 @@ module Flapjack
           if fibers.any?(&:alive?) || thin_pikelets.any?{|tp| !tp.backend.empty? }
             EM::Synchrony.sleep 0.25
           else
-            @pikelets.select {|p| thin_pikelets.include?(p) }.each do |tp|
-              tp[:pool].empty!
-            end
-
-            rsq_p = @pikelets.detect {|p|
-              ['email_notifier', 'sms_notifier'].include?(p[:type]) && !p[:pool].nil?
-            }
+            @resque_pool.empty! if @resque_pool
 
-            rsq_p[:pool].empty! if rsq_p
+            [Flapjack::Web, Flapjack::API].each do |klass|
+              next unless klass.class_variable_defined?('@@redis') &&
+                redis = klass.class_variable_get('@@redis')
+              redis.empty!
+            end
 
             EM.stop
             break

data/lib/flapjack/data/contact.rb

@@ -69,16 +69,18 @@ module Flapjack
         redis.hmset("contact:#{contact['id']}",
                     *['first_name', 'last_name', 'email'].collect {|f| [f, contact[f]]})
 
-        contact['media'].each_pair {|medium, address|
-          case medium
-          when 'pagerduty'
-            redis.hset("contact_media:#{contact['id']}", medium, address['service_key'])
-            redis.hmset("contact_pagerduty:#{contact['id']}",
-                        *['subdomain', 'username', 'password'].collect {|f| [f, address[f]]})
-          else
-            redis.hset("contact_media:#{contact['id']}", medium, address)
-          end
-        }
+        unless contact['media'].nil?
+          contact['media'].each_pair {|medium, address|
+            case medium
+            when 'pagerduty'
+              redis.hset("contact_media:#{contact['id']}", medium, address['service_key'])
+              redis.hmset("contact_pagerduty:#{contact['id']}",
+                          *['subdomain', 'username', 'password'].collect {|f| [f, address[f]]})
+            else
+              redis.hset("contact_media:#{contact['id']}", medium, address)
+            end
+          }
+        end
       end
 
       def pagerduty_credentials

data/lib/flapjack/data/entity.rb

@@ -12,7 +12,7 @@ module Flapjack
         raise "Redis connection not set" unless redis = options[:redis]
         redis.keys("entity_id:*").collect {|k|
           k =~ /^entity_id:(.+)$/; entity_name = $1
-          self.new(:name => entity_name, :id => redis.get("entity_id:#{entity_name}").to_i, :redis => redis)
+          self.new(:name => entity_name, :id => redis.get("entity_id:#{entity_name}"), :redis => redis)
         }
       end
 
@@ -51,7 +51,7 @@ module Flapjack
           self.add({'name' => entity_name}, :redis => redis)
         end
         self.new(:name => entity_name,
-                 :id => (entity_id.nil? || entity_id.empty?) ? nil : entity_id.to_i,
+                 :id => (entity_id.nil? || entity_id.empty?) ? nil : entity_id,
                  :redis => redis)
       end
 

data/lib/flapjack/data/entity_check.rb

@@ -368,15 +368,6 @@ module Flapjack
          :summary   => @redis.get("#{@key}:#{ts.first}:summary")}
       end
 
-      def historical_state_after(timestamp)
-        pos = @redis.zrank("#{@key}:sorted_state_timestamps", timestamp)
-        ts = @redis.zrange("#{@key}:sorted_state_timestamps", pos + 1, pos + 2)
-        return if ts.nil? || ts.empty?
-        {:timestamp => ts.first.to_i,
-         :state     => @redis.get("#{@key}:#{ts.first}:state"),
-         :summary   => @redis.get("#{@key}:#{ts.first}:summary")}
-      end
-
       # Returns a list of maintenance periods (either unscheduled or scheduled) for this
       # entity check, sorted by timestamp.
       #

data/lib/flapjack/data/global.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'flapjack/data/entity_check'
+
+module Flapjack
+
+  module Data
+
+    class Global
+
+      def self.unacknowledged_failing_checks(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+
+        redis.zrange('failed_checks', '0', '-1').reject {|entity_check|
+          redis.exists(entity_check + ':unscheduled_maintenance')
+        }.collect {|entity_check|
+          Flapjack::Data::EntityCheck.for_event_id(entity_check, :redis => redis)
+        }
+      end
+
+    end
+
+  end
+
+end

data/lib/flapjack/executive.rb

@@ -36,6 +36,7 @@ module Flapjack
       @notifylog.add(Log4r::FileOutputter.new("notifylog", :filename => notifylog))
 
       # FIXME: Put loading filters into separate method
+      # FIXME: should we make the filters more configurable by the end user?
       options = { :log => @logger, :persistence => @redis }
       @filters = []
       @filters << Flapjack::Filters::Ok.new(options)

data/lib/flapjack/jabber.rb

@@ -51,35 +51,27 @@ module Flapjack
         @config['password'].to_s)
 
       register_handler :ready do |stanza|
-        EM.next_tick do
-          EM.synchrony do
-            on_ready(stanza)
-          end
+        EventMachine::Synchrony.next_tick do
+          on_ready(stanza)
         end
       end
 
       register_handler :message, :groupchat?, :body => /^flapjack:\s+/ do |stanza|
-        EM.next_tick do
-          EM.synchrony do
-            on_groupchat(stanza)
-          end
+        EventMachine::Synchrony.next_tick do
+          on_groupchat(stanza)
         end
       end
 
       register_handler :message, :chat? do |stanza|
-        EM.next_tick do
-          EM.synchrony do
-            on_chat(stanza)
-          end
+        EventMachine::Synchrony.next_tick do
+          on_chat(stanza)
         end
       end
 
       register_handler :disconnected do |stanza|
         ret = true
-        EM.next_tick do
-          EM.synchrony do
-            ret = on_disconnect(stanza)
-          end
+        EventMachine::Synchrony.next_tick do
+          ret = on_disconnect(stanza)
         end
         ret
       end
@@ -130,7 +122,7 @@ module Flapjack
         end
 
         four_hours = 4 * 60 * 60
-        duration = (dur.nil? || (dur <= 0) || (dur > four_hours)) ? four_hours : dur
+        duration = (dur.nil? || (dur <= 0)) ? four_hours : dur
 
         event_id = @redis_handler.hget('unacknowledged_failures', ackid)
 
@@ -278,7 +270,7 @@ module Flapjack
           logger.debug(event.inspect)
           if 'shutdown'.eql?(type)
             if should_quit?
-              EM.next_tick do
+              EventMachine::Synchrony.next_tick do
                 # get delays without the next_tick
                 close # Blather::Client.close
               end
@@ -303,7 +295,7 @@ module Flapjack
 
             chat_type = :chat
             chat_type = :groupchat if @config['rooms'] && @config['rooms'].include?(address)
-            EM.next_tick do
+            EventMachine::Synchrony.next_tick do
               say(Blather::JID.new(address), msg, chat_type)
             end
           end

data/lib/flapjack/oobetet.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-#require 'socket'
+require 'socket'
 
 require 'eventmachine'
 require 'em-synchrony'
@@ -52,35 +52,32 @@ module Flapjack
                  :last_ack_sent => t }
 
       @last_alert = nil
+    end
 
+    # split out to ease testing
+    def register_handlers
       register_handler :ready do |stanza|
-        EM.next_tick do
-          EM.synchrony do
-            on_ready(stanza)
-          end
+        EventMachine::Synchrony.next_tick do
+          on_ready(stanza)
         end
       end
 
       register_handler :message, :groupchat? do |stanza|
-        EM.next_tick do
-          EM.synchrony do
-            on_groupchat(stanza)
-          end
+        EventMachine::Synchrony.next_tick do
+          on_groupchat(stanza)
         end
       end
 
       register_handler :disconnected do |stanza|
         ret = true
-        EM.next_tick do
-          EM.synchrony do
-            ret = on_disconnect(stanza)
-          end
+        EventMachine::Synchrony.next_tick do
+          ret = on_disconnect(stanza)
         end
         ret
       end
-
     end
 
+
     # Join the MUC Chat room after connecting.
     def on_ready(stanza)
       return if should_quit?
@@ -111,31 +108,37 @@ module Flapjack
 
     def on_groupchat(stanza)
       return if should_quit?
-      logger.debug("groupchat stanza body: " + stanza.body)
+
+      stanza_body = stanza.body
+
+      logger.debug("groupchat stanza body: " + stanza_body)
       logger.debug("groupchat message received: #{stanza.inspect}")
 
-      if stanza.body =~ /^(\w+).*#{Regexp.escape(@check_matcher)}/
+      if (stanza_body =~ /^(?:problem|recovery|acknowledgement)/i) &&
+         (stanza_body =~ /^(\w+).*#{Regexp.escape(@check_matcher)}/)
+
         # got something interesting
-        logger.debug("groupchat found the following state for #{@check_matcher}: #{$1.downcase}")
-        case $1.downcase
+        status = $1.downcase
+        t = Time.now.to_i
+        logger.debug("groupchat found the following state for #{@check_matcher}: #{status}")
+
+        case status
         when 'problem'
           logger.debug("updating @times last_problem")
-          @times[:last_problem] = Time.new.to_i
+          @times[:last_problem] = t
         when 'recovery'
           logger.debug("updating @times last_recovery")
-          @times[:last_recovery] = Time.new.to_i
+          @times[:last_recovery] = t
         when 'acknowledgement'
           logger.debug("updating @times last_ack")
-          @times[:last_ack] = Time.new.to_i
+          @times[:last_ack] = t
         end
-
       end
       logger.debug("@times: #{@times.inspect}")
-
     end
 
     def check_timers
-      t = Time.new.to_i
+      t = Time.now.to_i
       breach = nil
       @logger.debug("check_timers: inspecting @times #{@times.inspect}")
       case
@@ -145,7 +148,7 @@ module Flapjack
         breach = "haven't seen a test recovery notification in the last #{@max_latency} seconds"
       end
 
-      if !@flapjack_ok and !breach
+      unless @flapjack_ok || breach
         emit_jabber("Flapjack Self Monitoring is OK")
         emit_pagerduty("Flapjack Self Monitoring is OK", 'resolve')
       end
@@ -218,17 +221,16 @@ module Flapjack
         write(' ') if connected?
       end
 
-      check_timers_timer = EM::Synchrony.add_periodic_timer(10) do
-        check_timers
-      end
-
       setup
+      register_handlers
       connect # Blather::Client.connect
 
-      if should_quit?
-        keepalive_timer.cancel
-        check_timers_timer.cancel
+      until should_quit?
+        EM::Synchrony.sleep(10)
+        check_timers
       end
+
+      keepalive_timer.cancel
     end
 
   end