flapjack 1.6.0 → 2.0.0b1

data/features/steps/packaging-lintian_steps.rb

@@ -1,7 +1,3 @@
-Given /^I am at the project root$/ do
-  expect(Dir.pwd.split('/').last).to eq("flapjack")
-end
-
 Then /^I should see (\d+) lines of output$/ do |number|
   expect(@output.split.size).to eq(number.to_i)
 end

data/features/steps/time_travel_steps.rb

@@ -7,14 +7,8 @@ require 'active_support/time'
 When /^(.+) passes$/ do |time|
   period = Chronic.parse("#{time} from now")
   RedisDelorean.time_travel_to(period)
-  #puts "Time Travelled to #{Time.now.to_s}"
 end
 
-# Given /^I time travel to (.+)$/ do |period|
-#   RedisDelorean.time_travel_to(period)
-#   # puts "Time Travelled to #{Time.now.to_s}"
-# end
-
 Given /^the timezone is (.*)$/ do |tz|
   Time.zone = tz
   Chronic.time_class = Time.zone
@@ -22,24 +16,4 @@ end
 
 Given /^the time is (.*)$/ do |time|
   RedisDelorean.time_travel_to(Chronic.parse("#{time}"))
-  #puts "Time Travelled to #{Time.now.to_s}"
 end
-
-# Given /^I come back to the present$/ do
-#   RedisDelorean.back_to_the_present
-#   # puts "Time Travelled to the present, #{Time.now.to_s}"
-# end
-
-# Given /^I time travel in (.+) to (.+)$/ do |zone_name, timestamp|
-#   zone = ::Time.find_zone!(zone_name)
-#   time = zone.parse timestamp
-#   RedisDelorean.time_travel_to time
-#   # puts "Time Travelled to #{Time.now.to_s}"
-# end
-
-# Then /^the time in UTC should be about (.+)$/ do |timestamp|
-#   actual = Time.now.in_time_zone('UTC')
-#   expected = Time.parse("#{timestamp} UTC")
-#   (expected..expected+5).cover?(actual).should be true
-# end
-

data/features/support/daemons.rb

@@ -59,13 +59,9 @@ def kill_lingering_processes
       puts green("Process #{pid} has already exited.") if @debug
     end
 
-    if @debug
-      if process
-        puts blue("Output from #{pid} #{command}\n")
-        puts process.read + "\n"
-      else
-        # TODO capture STDOUT from daemonize?
-      end
+    if @debug && !process.nil?
+      puts blue("Output from #{pid} #{command}\n")
+      puts process.read + "\n"
     end
   end
   puts yellow("Done killing processes") if @debug
@@ -80,36 +76,15 @@ def time_and_pid_from_file(pid_file, cutoff_time = nil)
 end
 
 def spawn_process(command, opts={})
-  @daemons_output ||= []
-  @daemons_exit_status ||= []
-
   puts yellow("Running: #{command}") if @debug
 
   process_h = nil
 
   file = opts[:daemon_pidfile]
 
-  if file
-    time = Time.now
-    attempts = 0
-
-    @daemons_output << `#{command}`
-    @daemons_exit_status << $?
-
-    while attempts < 50
-      time_and_pid = time_and_pid_from_file(file, time)
-      if time_and_pid
-        process_h = {:pid => time_and_pid.last, :command => command}
-        break
-      end
-      attempts += 1
-      sleep 0.2
-    end
-  else
-    process = IO.popen(command)
-    pid = process.pid
-    process_h = {:process => process, :command => command}
-  end
+  process = IO.popen(command)
+  pid = process.pid
+  process_h = {:process => process, :command => command}
 
   raise "failed to spawn process #{command}" if process_h.nil?
 

data/features/support/env.rb

@@ -6,9 +6,8 @@ require 'delorean'
 require 'chronic'
 require 'active_support/time'
 require 'ice_cube'
+
 require 'flapjack/configuration'
-require 'flapjack/data/entity_check'
-require 'flapjack/data/event'
 
 if ENV['COVERAGE']
   require 'simplecov'
@@ -16,16 +15,19 @@ if ENV['COVERAGE']
     add_filter '/features/'
   end
   SimpleCov.at_exit do
+    # Oj.default_options = { :mode => :compat }
     SimpleCov.result.format!
   end
 end
 
 @debug = false
 
-ENV["FLAPJACK_ENV"] = 'test'
+require 'i18n'
+I18n.config.enforce_available_locales = true
+
 FLAPJACK_ENV = 'test'
 FLAPJACK_ROOT   = File.join(File.dirname(__FILE__), '..', '..')
-FLAPJACK_CONFIG = File.join(FLAPJACK_ROOT, 'etc', 'flapjack_config.yaml')
+FLAPJACK_CONFIG = File.join(FLAPJACK_ROOT, 'etc', 'flapjack_test_config.toml')
 
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 
@@ -35,29 +37,40 @@ require 'webmock/cucumber'
 WebMock.disable_net_connect!
 
 require 'flapjack'
+require 'flapjack/patches'
+require 'flapjack/redis_proxy'
+
+require 'flapjack/data/check'
+require 'flapjack/data/event'
+
 require 'flapjack/notifier'
 require 'flapjack/processor'
-require 'flapjack/patches'
 
 class MockLogger
   attr_accessor :messages
 
+  def self.configure_log(name)
+    @name = name
+  end
+
   def initialize
     @messages = []
   end
 
   %w(debug info warn error fatal).each do |level|
     class_eval <<-RUBY
-      def #{level}(msg)
-        @messages << msg
+      def #{level}(msg = nil, &block)
+        msg = yield if msg.nil? && block_given?
+        @messages << '[#{level.upcase}] :: ' +
+          (self.class.instance_variable_get('@name') || 'flapjack') + ' :: ' + msg
       end
     RUBY
   end
 end
 
-# poor man's stubbing
-class MockEmailer
-  include EM::Deferrable
+require 'mail'
+Mail.defaults do
+  delivery_method :test
 end
 
 class RedisDelorean
@@ -84,105 +97,85 @@ class RedisDelorean
     return deleted
 SHIFT_TTLS
 
-  def self.before_all(options = {})
-    redis = options[:redis]
-    @shift_ttls_sha = redis.script(:load, ShiftTTLsScript)
-  end
-
-  def self.before_each(options = {})
-    @redis = options[:redis]
+  def self.before_all
+    @shift_ttls_sha = Flapjack.redis.script(:load, ShiftTTLsScript)
   end
 
   def self.time_travel_to(dest_time)
     old_maybe_fake_time = Time.now.in_time_zone
     Delorean.time_travel_to(dest_time)
-    # puts "real time is #{Time.now_without_delorean.in_time_zone}"
-    # puts "old assumed time is #{old_maybe_fake_time}"
-    # puts "new assumed time is #{Time.now.in_time_zone}"
 
-    # keys_prior = @redis.keys('*')
-
-    del = @redis.evalsha(@shift_ttls_sha, ['*'],
-            [(dest_time - old_maybe_fake_time).to_i])
-
-    # keys_after = @redis.keys('*')
-
-    # puts "Expired #{del} key#{(del == 1) ? '' : 's'}, #{(keys_prior - keys_after).inspect}"
+    Flapjack.redis.evalsha(@shift_ttls_sha, ['*'],
+      [(dest_time - old_maybe_fake_time).to_i])
   end
-
 end
 
 config = Flapjack::Configuration.new
-redis_opts = config.load(FLAPJACK_CONFIG) ?
-             config.for_redis.merge(:driver => :ruby) :
-             {:db => 14, :driver => :ruby}
-redis = ::Redis.new(redis_opts)
-redis.flushdb
-RedisDelorean.before_all(:redis => redis)
-redis.quit
+Flapjack::RedisProxy.config = config.load(FLAPJACK_CONFIG) ?
+                                config.for_redis :
+                                {:db => 14, :driver => :ruby}
+Zermelo.redis = Flapjack.redis
+Flapjack.redis.flushdb
+RedisDelorean.before_all
+Flapjack.redis.quit
 
 # Not the most efficient of operations...
-def redis_peek(queue, start = 0, count = nil)
-  size = @notifier_redis.llen(queue)
+def redis_peek(queue, klass, start = 0, count = nil)
+  size = Flapjack.redis.llen(queue)
   start = 0 if start < 0
   count = (size - start) if count.nil? || (count > (size - start))
 
   (0..(size - 1)).inject([]) do |memo, n|
-    object = @notifier_redis.rpoplpush(queue, queue)
-    next memo unless (n >= start || n < (start + count))
-    memo << Flapjack.load_json(object)
+    obj_id = Flapjack.redis.rpoplpush(queue, queue)
+    next memo unless (n >= start || n < (start + count)) &&
+      (object = klass.find_by_id(obj_id))
+    memo << object
     memo
   end
 end
 
-Around do |scenario, blk|
-  EM.synchrony do
-    blk.call
-    EM.stop
-  end
-end
-
 Before do
-  @redis_opts = redis_opts
-  @logger = MockLogger.new
+  Flapjack.logger = MockLogger.new
 end
 
 After do
-  @logger.messages = []
-  @redis_opts = nil
+  Flapjack.logger.messages = []
+  WebMock.reset!
 end
 
 Before('@processor') do
-  @processor = Flapjack::Processor.new(:logger => @logger,
-    :redis_config => redis_opts, :config => {})
-  @redis = @processor.instance_variable_get('@redis')
+  Flapjack.redis.flushdb
+  MockLogger.configure_log('flapjack-processor')
+  @processor = Flapjack::Processor.new(:boot_time => Time.now,
+    :config => {'new_check_scheduled_maintenance_duration' => '0 seconds'})
+  @processor.start_stats
 end
 
 After('@processor') do
-  @redis.flushdb
-  @redis.quit
-  @redis = nil
+  Flapjack.redis.quit
 end
 
 Before('@notifier') do
-  @notifier = Flapjack::Notifier.new(:logger => @logger,
-    :redis_config => redis_opts,
+  Flapjack.redis.flushdb
+  MockLogger.configure_log('flapjack-notifier')
+  @notifier  = Flapjack::Notifier.new(
     :config => {'email_queue' => 'email_notifications',
                 'sms_queue' => 'sms_notifications',
                 'sms_nexmo_queue' => 'sms_nexmo_notifications',
                 'sns_queue' => 'sns_notifications',
                 'default_contact_timezone' => 'America/New_York'})
-  @notifier_redis = @notifier.instance_variable_get('@redis')
 end
 
 After('@notifier') do
-  @notifier_redis.flushdb
-  @notifier_redis.quit
-  @notifier_redis = nil
+  Flapjack.redis.quit
+end
+
+Before('@notifications') do
+  Mail::TestMailer.deliveries.clear
 end
 
-Before('@time') do
-  RedisDelorean.before_each(:redis => @redis || @notifier_redis)
+Before('@not_jruby') do
+  pending if 'java'.eql?(RUBY_PLATFORM)
 end
 
 After('@time') do
@@ -190,19 +183,19 @@ After('@time') do
 end
 
 After('@process') do
-  ['tmp/cucumber_cli/flapjack_cfg.yaml',
-   'tmp/cucumber_cli/flapjack_cfg.yaml.bak',
-   'tmp/cucumber_cli/flapjack_cfg_d.yaml',
+  ['tmp/cucumber_cli/flapjack_cfg.toml',
+   'tmp/cucumber_cli/flapjack_cfg.toml.bak',
+   'tmp/cucumber_cli/flapjack_cfg_d.toml',
    'tmp/cucumber_cli/flapjack.log',
    'tmp/cucumber_cli/flapjack.pid',
    'tmp/cucumber_cli/nagios_perfdata.fifo',
    'tmp/cucumber_cli/flapjack-nagios-receiver.pid',
    'tmp/cucumber_cli/flapjack-nagios-receiver.log',
-   'tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml',
-   'tmp/cucumber_cli/flapjack-nagios-receiver.yaml',
+   'tmp/cucumber_cli/flapjack-nagios-receiver_d.toml',
+   'tmp/cucumber_cli/flapjack-nagios-receiver.toml',
    'tmp/cucumber_cli/flapper.pid',
    'tmp/cucumber_cli/flapper.log',
-   'tmp/cucumber_cli/flapjack-populator.yaml',
+   'tmp/cucumber_cli/flapjack-populator.toml',
    'tmp/cucumber_cli/flapjack-populator-contacts.json',
    'tmp/cucumber_cli/flapjack-populator-entities.json',
   ].each do |file|
@@ -210,5 +203,3 @@ After('@process') do
     File.unlink(file)
   end
 end
-
-

data/flapjack.gemspec

@@ -2,45 +2,43 @@
 require File.expand_path('../lib/flapjack/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = [ "Lindsay Holmwood", "Jesse Reynolds", "Ali Graham", "Sarah Kowalik" ]
-  gem.email         = "lindsay@holmwood.id.au"
-  gem.description   = "Flapjack is a distributed monitoring notification system that provides a scalable method for processing streams of events from Nagios and deciding who should be notified"
-  gem.summary       = "Intelligent, scalable, distributed monitoring notification system."
-  gem.homepage      = "http://flapjack.io/"
+  gem.authors       = [ 'Lindsay Holmwood', 'Jesse Reynolds', 'Ali Graham', 'Sarah Kowalik' ]
+  gem.email         = 'lindsay@holmwood.id.au'
+  gem.description   = 'Flapjack is a distributed monitoring notification system that provides a scalable method for processing streams of events from Nagios and deciding who should be notified'
+  gem.summary       = 'Intelligent, scalable, distributed monitoring notification system.'
+  gem.homepage      = 'http://flapjack.io/'
   gem.license       = 'MIT'
 
   # 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']
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  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"
-  gem.require_paths = ["lib"]
+  gem.name          = 'flapjack'
+  gem.require_paths = ['lib']
   gem.version       = Flapjack::VERSION
 
-  gem.add_dependency 'dante', '= 0.2.0'
-  gem.add_dependency 'oj', '>= 2.9.0'
-  gem.add_dependency 'eventmachine', '~> 1.0.0'
-  gem.add_dependency 'redis', '~> 3.0.6'
   gem.add_dependency 'hiredis'
-  gem.add_dependency 'em-hiredis'
-  gem.add_dependency 'em-synchrony', '~> 1.0.2'
-  gem.add_dependency 'em-http-request'
+  gem.add_dependency 'redis', '>= 3.0.7'
+  gem.add_dependency 'json-stream'
+  gem.add_dependency 'zermelo', '= 1.4.3'
   gem.add_dependency 'sinatra'
-  gem.add_dependency 'rack-fiber_pool'
-  gem.add_dependency 'thin', '~> 1.6.1'
+  gem.add_dependency 'swagger-blocks'
   gem.add_dependency 'mail'
-  gem.add_dependency 'blather', '~> 0.8.3'
+  gem.add_dependency 'xmpp4r', '>= 0.5.5'
+  gem.add_dependency 'nexmo', '= 2.0.0'
   gem.add_dependency 'chronic'
   gem.add_dependency 'chronic_duration'
-  gem.add_dependency 'terminal-table'
   gem.add_dependency 'activesupport'
   gem.add_dependency 'ice_cube'
+  gem.add_dependency 'icalendar'
   gem.add_dependency 'tzinfo'
   gem.add_dependency 'tzinfo-data'
-  gem.add_dependency 'rbtrace'
-  gem.add_dependency 'rake'
-  gem.add_dependency 'gli', '= 2.12.0'
-  gem.add_dependency 'nokogiri', '= 1.6.2.1'
-  gem.add_dependency 'nexmo', '= 2.0.0'
+  gem.add_dependency 'gli', '= 2.13.1'
+  gem.add_dependency 'terminal-table'
+  gem.add_dependency 'toml-rb'
+  gem.add_dependency 'puma'
+  gem.add_dependency 'flapjack-diner', '= 2.0.0b1'
+
+  gem.add_development_dependency 'rake'
 end

data/lib/flapjack.rb

@@ -1,25 +1,32 @@
 #!/usr/bin/env ruby
 
-require 'oj'
+require 'active_support/time'
+require 'active_support/json/encoding'
+
+ActiveSupport.use_standard_json_time_format = true
+ActiveSupport.time_precision = 0
+
+require 'json'
+
+require 'flapjack/logger'
 
 module Flapjack
+  UUID_RE = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
 
   DEFAULT_INITIAL_FAILURE_DELAY = 30
   DEFAULT_REPEAT_FAILURE_DELAY  = 60
 
   def self.load_json(data)
-    Oj.load(data, :mode => :strict, :symbol_keys => false)
+    ActiveSupport::JSON.decode(data)
   end
 
   def self.dump_json(data)
-    Oj.dump(data, :mode => :compat, :time_format => :ruby, :indent => 0)
+    ActiveSupport::JSON.encode(data)
   end
 
   def self.sanitize(str)
     return str if str.nil? || !str.is_a?(String) || str.valid_encoding?
-    return str.scrub('?') if str.respond_to?(:scrub)
-    str.chars.collect {|c| c.valid_encoding? ? c : '?' }.join
+    return str.scrub('?') if str.respond_to(:scrub)
+    str.chars.collect {|c| c.valid_encoding? ? c : '_' }.join
   end
-
 end
-