flapjack 0.6.39 → 0.6.40

data/.gitignore

@@ -9,7 +9,6 @@ gems/gems/*
 gems/bin/*
 recipients.yaml
 .yardoc
-#doc/*
 pkg/*
 !etc/flapjack/recipients.yaml
 spec/test.db
@@ -18,9 +17,10 @@ features/support/etc/netsaint/*
 log/*
 vendor
 .bundle
-etc/flapjack_config.yaml
+etc/*.yaml
 coverage
 tmp/pids/*
 tmp/spec*
+tmp/profiles
 flapjack-*.gem
 

data/Gemfile

@@ -2,11 +2,15 @@ source :rubygems
 
 gemspec :name => 'flapjack'
 
+group :development do
+  gem 'ruby-prof'
+end
+
 group :test do
   gem 'rspec'
   gem 'cucumber'
   gem 'delorean'
-  gem 'rack-test', :git => "git://github.com/brynary/rack-test.git", :ref => "8153c07"
+  gem 'rack-test'
   gem 'resque_spec'
   gem 'webmock'
   gem 'guard'

data/README.md

@@ -18,11 +18,11 @@ At its core, flapjack process events received from external check execution engi
 
 TODO numbered list for simplest possible Flapjack run
 
-For more information, including full specification of the configuration file and the data import formats, please refer to the [Flapjack Wiki](https://github.com/ali-graham/flapjack/wiki/USING).
+For more information, including full specification of the configuration file and the data import formats, please refer to the [Flapjack Wiki](https://github.com/flpjck/flapjack/wiki/USING).
 
 ## Developing Flapjack
 
-Information on developing more Flapjack components or contributing to core Flapjack development can be found in the [Flapjack Wiki](https://github.com/ali-graham/flapjack/wiki/DEVELOPING).
+Information on developing more Flapjack components or contributing to core Flapjack development can be found in the [Flapjack Wiki](https://github.com/flpjck/flapjack/wiki/DEVELOPING).
 
 ## Documentation Submodule
 
@@ -35,6 +35,7 @@ git submodule update
 
 If you make changes to the documentation locally, here's how to publish them:
 
+* first up, checkout master within the doc subdir, otherwise you'll be commiting to no branch, aka no man's land
 * git add, commit and push from inside the doc subdir
 * add, commit and push the doc dir from the root (this updates the pointer in the main git repo to the correct ref in the doc repo, we think...)
 

data/Rakefile

@@ -20,7 +20,8 @@ Bundler::GemHelper.install_tasks
 Cucumber::Rake::Task.new(:features) do |t|
   #t.cucumber_opts = 'features --format pretty'
   #t.cucumber_opts = '--format progress'
-  t.cucumber_opts = '--format fuubar'
+  #t.cucumber_opts = '--format fuubar'
+  t.cucumber_opts = '--format Cucumber::Formatter::Fuubar'
 end
 
 require 'rspec/core/rake_task'

data/bin/flapjack

@@ -33,7 +33,7 @@ end.parse!(ARGV)
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
 
-config_env = Flapjack::Configuration.new.load(options.config)
+config_env, redis_options = Flapjack::Configuration.new.load(options.config)
 
 if config_env.nil? || config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
@@ -50,7 +50,7 @@ end
 
 require 'flapjack/coordinator'
 
-coordinator = Flapjack::Coordinator.new(config_env)
+coordinator = Flapjack::Coordinator.new(config_env, redis_options)
 coordinator.log_file = (config_env['log_file'] || 'log/flapjack.log')
 coordinator.pid_file = pid_file
 

data/bin/flapjack-nagios-receiver

@@ -31,7 +31,7 @@ end.parse!(ARGV)
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
 
-@config_env = Flapjack::Configuration.new.load(options.config)
+@config_env, @redis_options = Flapjack::Configuration.new.load(options.config)
 
 if @config_env.nil? || @config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
@@ -51,12 +51,6 @@ end
 # host_perfdata_file_template=[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\tHOST\t$HOSTSTATE$\t$HOSTEXECUTIONTIME$\t$HOSTLATENCY$\t$HOSTOUTPUT$\t$HOSTPERFDATA$
 # service_perfdata_file_template=[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$
 
-def get_redis_connection(cfg)
-  opts = cfg['path'] ? {:path => cfg['path']} :
-                       {:host => cfg['host'], :port => cfg['port']}
-  Redis.new(opts.merge(:db => cfg['db']))
-end
-
 def process_input(redis)
   begin
     while line = @fifo.gets
@@ -97,7 +91,7 @@ def process_input(redis)
 end
 
 def main
-  redis = get_redis_connection(@config_env['redis'])
+  redis = Redis.new(@redis_options)
 
   while true
     process_input(redis)

data/bin/flapjack-populator

@@ -43,7 +43,7 @@ end.parse!(ARGV)
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
 
-config_env = Flapjack::Configuration.new.load(options.config)
+config_env, redis_options = Flapjack::Configuration.new.load(options.config)
 
 if config_env.nil? || config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
@@ -55,18 +55,12 @@ if options.from
   file     = File.new(filename)
 end
 
-def get_redis_connection(cfg)
-  opts = cfg['path'] ? {:path => cfg['path']} :
-                       {:host => cfg['host'], :port => cfg['port']}
-  Redis.new(opts.merge(:db => cfg['db']))
-end
-
 case command
 when "import-contacts"
   contacts = JSON.parse(file)
 
   if contacts && contacts.is_a?(Enumerable) && contacts.any? {|e| !e['id'].nil?}
-    @persistence = get_redis_connection(config_env['redis'])
+    @persistence = Redis.new(redis_options)
     @persistence.multi do
       contacts.each do |contact|
         unless contact['id']
@@ -83,7 +77,7 @@ when "import-entities"
   entities = JSON.parse(file)
 
   if entities && entities.is_a?(Enumerable) && entities.any? {|e| !e['id'].nil?}
-    @persistence = get_redis_connection(config_env['redis'])
+    @persistence = Redis.new(redis_options)
     @persistence.multi
     entities.each do |entity|
       unless entity['id']
@@ -97,8 +91,14 @@ when "import-entities"
   end
 
 when "purge-events"
-  @persistence = get_redis_connection(config_env['redis'])
-  Flapjack::Data::Event.purge_all(:redis => @persistence)
+  @persistence = Redis.new(redis_options)
+  events_size = @persistence.llen('events')
+  puts "purging #{events_size} events..."
+  etq = "events.#{Time.now.to_i}"
+  puts "renaming 'events' to '#{etq}'"
+  @persistence.rename('events', etq)
+  puts "setting expiry of '#{etq}' to 8 hours"
+  @persistence.expire(etq, (60 * 60 * 8))
   @persistence.quit
 
 else

data/etc/flapjack_config.yaml.example

@@ -83,9 +83,11 @@ development:
   web:
     enabled: yes
     port: 5080
+    access_log: "log/web_access.log"
   api:
     enabled: yes
     port: 5081
+    access_log: "log/api_access.log"
 
 test:
   redis:
@@ -123,3 +125,29 @@ production:
     password: "xxxx"
   web:
     instances: 1
+
+profile:
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    db: 14
+  executive:
+    enabled: yes
+    notification_log_file: log/flapjack-notification.log
+  email_notifier:
+    enabled: no
+    queue: email_notifications
+  jabber_gateway:
+    enabled: yes
+    queue: jabber_notifications
+    server: "jabber.domain.tld"
+    port: 5222
+    jabberid: "flapjack@jabber.domain.tld"
+    password: "good-password"
+    alias: "flapjack"
+    rooms:
+      - "gimp@conference.jabber.domain.tld"
+      - "log@conference.jabber.domain.tld"
+  web:
+    enabled: no
+    port: 5080

data/features/steps/events_steps.rb

@@ -5,7 +5,7 @@ require 'flapjack/data/event'
 
 def drain_events
   loop do
-    event = Flapjack::Data::Event.next(:block => false, :persistence => @redis)
+    event = Flapjack::Data::Event.next(:block => false, :redis => @redis)
     break unless event
     @app.send(:process_event, event)
   end

data/features/steps/notifications_steps.rb

@@ -2,6 +2,7 @@
 include Mail::Matchers
 
 # copied from flapjack-populator
+# TODO use Flapjack::Data::Contact.add
 def add_contact(contact = {})
   @redis.multi
   @redis.del("contact:#{contact['id']}")
@@ -67,7 +68,7 @@ When /^an event notification is generated for entity '([\w\.\-]+)'$/ do |entity|
                                     'entity'  => entity,
                                     'check'   => 'ping')
   entity_check = Flapjack::Data::EntityCheck.for_entity_name(entity, 'ping', :redis => @redis)
-  @app.send(:generate_notification, event, entity_check)
+  @app.send(:send_notification_messages, event, entity_check)
 end
 
 Then /^an SMS notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
@@ -127,7 +128,7 @@ When /^the SMS notification handler runs successfully$/ do
   # returns success by default - currently matches all addresses, maybe load from config?
   stub_request(:get, /.*/)
   # TODO load config from cfg file instead?
-  Flapjack::Notification::Sms.class_variable_set('@@config', {'username' => 'abcd', 'password' => 'efgh'})
+  Flapjack::Notification::Sms.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
 
   lambda {
     Flapjack::Notification::Sms.dispatch(@sms_notification, :logger => @logger, :redis => @redis)
@@ -145,8 +146,10 @@ When /^the SMS notification handler fails to send an SMS$/ do
 end
 
 When /^the email notification handler runs successfully$/ do
+  Resque.redis = @redis
+  Flapjack::Notification::Email.bootstrap(:config => {})
   lambda {
-    Flapjack::Notification::Email.dispatch(@email_notification, :logger => @logger, :redis => @redis)
+    Flapjack::Notification::Email.perform(@email_notification)
   }.should_not raise_error
 end
 
@@ -157,7 +160,7 @@ When /^the email notification handler fails to send an email$/ do
   pending
   lambda {
     @email_notification['address'] = nil
-    Flapjack::Notification::Email.dispatch(@email_notification, :logger => @logger, :redis => @redis)
+    Flapjack::Notification::Email.perform(@email_notification)
   }.should_not raise_error
 end
 

data/features/support/env.rb

@@ -8,8 +8,7 @@ if ENV['COVERAGE']
 end
 
 ENV["FLAPJACK_ENV"] = 'test'
-require 'bundler'
-Bundler.require(:default, :test)
+FLAPJACK_ENV = 'test'
 
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 
@@ -21,6 +20,8 @@ WebMock.disable_net_connect!
 require 'flapjack/executive'
 require 'flapjack/patches'
 
+require 'resque_spec'
+
 class MockLogger
   attr_accessor :messages
 
@@ -46,15 +47,25 @@ redis = ::Redis.new(redis_opts)
 redis.flushdb
 redis.quit
 
+# NB: this seems to execute outside the Before/After hooks
+# regardless of placement -- this is what we want, as the
+# @redis driver should be initialised in the sync block.
+Around do |scenario, blk|
+  EM.synchrony do
+    blk.call
+    EM.stop
+  end
+end
+
 Before do
   @logger = MockLogger.new
   # Use a separate database whilst testing
   @app = Flapjack::Executive.new
-  @app.bootstrap(:logger => @logger, :redis => redis_opts,
+  @app.bootstrap(:logger => @logger,
     :config => {'email_queue' => 'email_notifications',
-                'sms_queue' => 'sms_notifications'})
-  @app.setup
-  @redis = @app.redis
+                'sms_queue' => 'sms_notifications'},
+    :redis_config => redis_opts)
+  @redis = @app.instance_variable_get('@redis')
 end
 
 After do

data/flapjack.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'redis'
   gem.add_dependency 'em-resque'
   gem.add_dependency 'sinatra'
+  gem.add_dependency 'async-rack'
   gem.add_dependency 'rack-fiber_pool'
   gem.add_dependency 'haml'
   gem.add_dependency 'thin'

data/lib/flapjack/api.rb

@@ -12,9 +12,13 @@ require 'rack/fiber_pool'
 require 'sinatra/base'
 
 require 'flapjack/pikelet'
+require 'flapjack/redis_pool'
 
 require 'flapjack/api/entity_presenter'
 
+require 'async-rack'
+require 'flapjack/rack_logger'
+
 require 'flapjack/data/contact'
 require 'flapjack/data/entity'
 require 'flapjack/data/entity_check'
@@ -49,7 +53,7 @@ module Flapjack
 
     set :show_exceptions, false
 
-    if 'test'.eql?(FLAPJACK_ENV)
+    if defined?(FLAPJACK_ENV) && 'test'.eql?(FLAPJACK_ENV)
       # expose test errors properly
       set :raise_errors, true
     else
@@ -65,16 +69,40 @@ module Flapjack
     use Rack::MethodOverride
     use Rack::JsonParamsParser
 
-    extend Flapjack::Pikelet
+    api_logger = Flapjack::RackLogger.new('log/api_access.log')
+    use Rack::CommonLogger, api_logger
+
+    class << self
+      include Flapjack::ThinPikelet
+
+      attr_accessor :redis
+
+      alias_method :thin_bootstrap, :bootstrap
+      alias_method :thin_cleanup,   :cleanup
+
+      def bootstrap(opts = {})
+        thin_bootstrap(opts)
+        @redis = Flapjack::RedisPool.new(:config => opts[:redis_config], :size => 1)
+      end
+
+      def cleanup
+        @redis.empty! if @redis
+        thin_cleanup
+      end
+
+    end
+
+    def redis
+      self.class.instance_variable_get('@redis')
+    end
 
-    before do
-      # will only initialise the first time it's run
-      Flapjack::API.bootstrap
+    def logger
+      self.class.instance_variable_get('@logger')
     end
 
     get '/entities' do
       content_type :json
-      ret = Flapjack::Data::Entity.all(:redis => @@redis).sort_by(&:name).collect {|e|
+      ret = Flapjack::Data::Entity.all(:redis => redis).sort_by(&:name).collect {|e|
         {'id' => e.id, 'name' => e.name,
          'checks' => e.check_list.sort.collect {|c|
                        entity_check_status(e, c)
@@ -86,7 +114,7 @@ module Flapjack
 
     get '/checks/:entity' do
       content_type :json
-      entity = Flapjack::Data::Entity.find_by_name(params[:entity], :redis => @@redis)
+      entity = Flapjack::Data::Entity.find_by_name(params[:entity], :redis => redis)
       if entity.nil?
         status 404
         return
@@ -100,7 +128,7 @@ module Flapjack
       entity_name = params[:captures][0]
       check = params[:captures][1]
 
-      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => @@redis)
+      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis)
       if entity.nil?
         status 404
         return
@@ -125,7 +153,7 @@ module Flapjack
       entity_name = params[:captures][0]
       check = params[:captures][1]
 
-      entity = entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => @@redis)
+      entity = entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis)
       if entity.nil?
         status 404
         return
@@ -136,10 +164,10 @@ module Flapjack
 
       presenter = if check
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
-          check, :redis => @@redis)
+          check, :redis => redis)
         Flapjack::API::EntityCheckPresenter.new(entity_check)
       else
-        Flapjack::API::EntityPresenter.new(entity, :redis => @@redis)
+        Flapjack::API::EntityPresenter.new(entity, :redis => redis)
       end
 
       presenter.outages(start_time, end_time).to_json
@@ -151,7 +179,7 @@ module Flapjack
       entity_name = params[:captures][0]
       check = params[:captures][1]
 
-      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => @@redis)
+      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis)
       if entity.nil?
         status 404
         return
@@ -162,10 +190,10 @@ module Flapjack
 
       presenter = if check
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
-          check, :redis => @@redis)
+          check, :redis => redis)
         Flapjack::API::EntityCheckPresenter.new(entity_check)
       else
-        Flapjack::API::EntityPresenter.new(entity, :redis => @@redis)
+        Flapjack::API::EntityPresenter.new(entity, :redis => redis)
       end
 
       presenter.unscheduled_maintenance(start_time, end_time).to_json
@@ -177,7 +205,7 @@ module Flapjack
       entity_name = params[:captures][0]
       check = params[:captures][1]
 
-      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => @@redis)
+      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis)
       if entity.nil?
         status 404
         return
@@ -188,10 +216,10 @@ module Flapjack
 
       presenter = if check
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
-          check, :redis => @@redis)
+          check, :redis => redis)
         Flapjack::API::EntityCheckPresenter.new(entity_check)
       else
-        Flapjack::API::EntityPresenter.new(entity, :redis => @@redis)
+        Flapjack::API::EntityPresenter.new(entity, :redis => redis)
       end
       presenter.scheduled_maintenance(start_time, end_time).to_json
     end
@@ -202,7 +230,7 @@ module Flapjack
       entity_name = params[:captures][0]
       check = params[:captures][1]
 
-      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => @@redis)
+      entity = Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis)
       if entity.nil?
         status 404
         return
@@ -213,10 +241,10 @@ module Flapjack
 
       presenter = if check
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
-          check, :redis => @@redis)
+          check, :redis => redis)
         Flapjack::API::EntityCheckPresenter.new(entity_check)
       else
-        Flapjack::API::EntityPresenter.new(entity, :redis => @@redis)
+        Flapjack::API::EntityPresenter.new(entity, :redis => redis)
       end
 
       presenter.downtime(start_time, end_time).to_json
@@ -225,13 +253,13 @@ module Flapjack
     # create a scheduled maintenance period for a service on an entity
     post '/scheduled_maintenances/:entity/:check' do
       content_type :json
-      entity = Flapjack::Data::Entity.find_by_name(params[:entity], :redis => @@redis)
+      entity = Flapjack::Data::Entity.find_by_name(params[:entity], :redis => redis)
       if entity.nil?
         status 404
         return
       end
       entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
-        params[:check], :redis => @@redis)
+        params[:check], :redis => redis)
       entity_check.create_scheduled_maintenance(:start_time => params[:start_time],
         :duration => params[:duration], :summary => params[:summary])
       status 204
@@ -242,7 +270,7 @@ module Flapjack
     # the entity-check as a whole
     post '/acknowledgements/:entity/:check' do
       content_type :json
-      entity = Flapjack::Data::Entity.find_by_name(params[:entity], :redis => @@redis)
+      entity = Flapjack::Data::Entity.find_by_name(params[:entity], :redis => redis)
       if entity.nil?
         status 404
         return
@@ -252,12 +280,28 @@ module Flapjack
       duration = (dur.nil? || (dur <= 0)) ? (4 * 60 * 60) : dur
 
       entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
-        params[:check], :redis => @@redis)
+        params[:check], :redis => redis)
       entity_check.create_acknowledgement('summary' => params[:summary],
         'duration' => duration)
       status 204
     end
 
+    post '/test_notifications/:entity/:check' do
+      content_type :json
+      entity = Flapjack::Data::Entity.find_by_name(params[:entity], :redis => redis)
+      if entity.nil?
+        status 404
+        return
+      end
+
+      summary = params[:summary] || "Testing notifications to all contacts interested in entity #{entity.name}"
+
+      entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
+        params[:check], :redis => redis)
+      entity_check.test_notifications('summary' => summary)
+      status 204
+    end
+
     post '/entities' do
       pass unless 'application/json'.eql?(request.content_type)
       content_type :json
@@ -272,7 +316,7 @@ module Flapjack
             errors << "Entity not imported as it has no id: #{entity.inspect}"
             next
           end
-          Flapjack::Data::Entity.add(entity, :redis => @@redis)
+          Flapjack::Data::Entity.add(entity, :redis => redis)
         end
         ret = 200
       else
@@ -291,13 +335,13 @@ module Flapjack
 
       contacts = params[:contacts]
       if contacts && contacts.is_a?(Enumerable) && contacts.any? {|c| !c['id'].nil?}
-        Flapjack::Data::Contact.delete_all(:redis => @@redis)
+        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}"
             next
           end
-          Flapjack::Data::Contact.add(contact, :redis => @@redis)
+          Flapjack::Data::Contact.add(contact, :redis => redis)
         end
         ret = 200
       else
@@ -315,7 +359,7 @@ module Flapjack
 
       def entity_check_status(entity, check)
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
-          check, :redis => @@redis)
+          check, :redis => redis)
         return if entity_check.nil?
         { 'name'                                => check,
           'state'                               => entity_check.state,