flapjack 1.2.1 → 1.2.2

data/spec/lib/flapjack/pikelet_spec.rb

@@ -12,10 +12,6 @@ describe Flapjack::Pikelet do
 
   let(:time) { Time.now }
 
-  before do
-    Flapjack::Pikelet::Resque.class_variable_set(:@@resque_pool, nil)
-  end
-
   it "creates and starts a processor pikelet" do
     expect(Flapjack::Logger).to receive(:new).and_return(logger)
 
@@ -38,35 +34,25 @@ describe Flapjack::Pikelet do
     pik.start
   end
 
-  it "creates and starts a resque worker gateway" do
+  it "creates and starts a generic worker gateway" do
     expect(Flapjack::Logger).to receive(:new).and_return(logger)
 
     expect(config).to receive(:[]).with('logger').and_return(nil)
-    expect(config).to receive(:[]).with('queue').and_return('email_notif')
-
-    resque_redis = double('resque_redis')
-    redis = double('redis')
-    expect(Flapjack::RedisPool).to receive(:new).twice.and_return(resque_redis, redis)
-    expect(Resque).to receive(:redis=).with(resque_redis)
 
-    expect(Flapjack::Gateways::Email).to receive(:instance_variable_set).
-      with('@config', config)
-    expect(Flapjack::Gateways::Email).to receive(:instance_variable_set).
-      with('@redis', redis)
-    expect(Flapjack::Gateways::Email).to receive(:instance_variable_set).
-      with('@logger', logger)
+    fc = double('coordinator')
 
-    worker = double('worker')
-    expect(worker).to receive(:work).with(0.1)
-    expect(Flapjack::Gateways::Email).to receive(:start)
-    expect(EM::Resque::Worker).to receive(:new).with('email_notif').and_return(worker)
+    email = double('email')
+    expect(email).to receive(:start)
+    expect(Flapjack::Gateways::Email).to receive(:new).with(:config => config,
+        :redis_config => redis_config, :boot_time => time, :logger => logger, :coordinator => fc).
+      and_return(email)
 
     expect(fiber).to receive(:resume)
     expect(Fiber).to receive(:new).and_yield.and_return(fiber)
 
     pik = Flapjack::Pikelet.create('email', :config => config,
-      :redis_config => redis_config)
-    expect(pik).to be_a(Flapjack::Pikelet::Resque)
+      :redis_config => redis_config, :boot_time => time, :coordinator => fc)
+    expect(pik).to be_a(Flapjack::Pikelet::Generic)
     pik.start
   end
 

data/spec/lib/flapjack/redis_pool_spec.rb

@@ -15,6 +15,7 @@ describe Flapjack::RedisPool do
       expect(Flapjack::Data::Migration).to receive(:correct_notification_rule_contact_linkages).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:migrate_entity_check_data_if_required).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:create_entity_ids_if_required).exactly(redis_count).times
+      expect(Flapjack::Data::Migration).to receive(:clear_orphaned_entity_ids).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:refresh_archive_index).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:validate_scheduled_maintenance_periods).exactly(redis_count).times
 

data/tasks/profile.rake

@@ -11,7 +11,6 @@ namespace :profile do
   FLAPJACK_PORT = ((port > 1024) && (port <= 65535)) ? port : 8075
 
   REPETITIONS     = 10
-  RESQUE_REPETITIONS = 2
 
   require 'ruby-prof'
 
@@ -46,78 +45,6 @@ namespace :profile do
     redis.quit
   end
 
-  # rubyprof doesn't like the mail gem, possibly due to treetop -- crashes
-  # with "stack level too deep" errors when generating if the profiling
-  # runs over 3 or more mails.
-  def profile_resque(cfg_name, config, redis_options, &block)
-    redis = Redis.new(redis_options.merge(:driver => 'ruby'))
-    check_db_empty(:redis => redis, :redis_options => redis_options)
-    setup_baseline_data(:redis => redis)
-
-    ::Resque.redis = redis
-
-    EM.synchrony do
-      FlapjackProfileResque.instance_eval {
-
-        class << self
-
-          alias_method :orig_perform, :perform
-
-          # NB: this is very brittle in the case of exceptions; Resque swallows them,
-          # so you'll need to turn on the worker's verbose switches below to see what's
-          # really going on
-          def perform(notification)
-            r = nil
-            begin
-              count = if FlapjackProfileResque.class_variable_defined?('@@profile_count')
-                FlapjackProfileResque.class_variable_get('@@profile_count')
-              else
-                FlapjackProfileResque.class_variable_set('@@profile_count', 0)
-              end
-
-              RubyProf.send( (count.zero? ? :start : :resume) )
-              r = orig_perform(notification)
-              RubyProf.pause
-
-              count += 1
-              FlapjackProfileResque.class_variable_set('@@profile_count', count)
-            rescue Exception => e
-              puts e.message
-            end
-            r
-          end
-        end
-
-      }
-
-      FlapjackProfileResque.bootstrap(:config => config)
-
-      worker = EM::Resque::Worker.new(config['queue'])
-      worker.verbose = true
-      worker.very_verbose = true
-
-      EM.defer(block)
-
-      worker.work(0.1) {|job|
-        if FlapjackProfileResque.class_variable_defined?('@@profile_count') &&
-          (FlapjackProfileResque.class_variable_get('@@profile_count') >= RESQUE_REPETITIONS)
-          job.worker.shutdown
-        end
-      }
-
-      result = RubyProf.stop
-      printer = RubyProf::MultiPrinter.new(result)
-      output_dir = File.join('tmp', 'profiles')
-      FileUtils.mkdir_p(output_dir)
-      printer.print(:path => output_dir, :profile => cfg_name)
-
-      EM.stop
-    end
-
-    empty_db(:redis => redis)
-    redis.quit
-  end
-
   def profile_thin(klass, name, config, redis_options, &block)
     redis = Redis.new(redis_options.merge(:driver => 'ruby'))
     check_db_empty(:redis => redis, :redis_options => redis_options)
@@ -252,13 +179,14 @@ namespace :profile do
   task :jabber do
 
     require 'flapjack/jabber'
+    require 'flapjack/data/alert'
     require 'flapjack/data/contact'
     require 'flapjack/data/event'
     require 'flapjack/data/notification'
 
     FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'profile'
     config_env, redis_options = load_config
-    profile_pikelet(Flapjack::Jabber, 'jabber', config_env['jabber_gateway'],
+    profile_pikelet(Flapjack::Gateways::Jabber, 'jabber', config_env['jabber_gateway'],
       redis_options) {
 
         # this executes in a separate thread, so no Fibery stuff is allowed
@@ -277,8 +205,8 @@ namespace :profile do
           notification.messages(:contacts => [contact]).each do |msg|
             contents = msg.contents
             contents['event_count'] = n
-            redis.rpush(config_env['jabber_gateway']['queue'],
-              Flapjack.dump_json(contents))
+            Flapjack::Data::Alert.add(config_env['jabber_gateway']['queue'],
+              contents)
           end
         end
 
@@ -291,51 +219,39 @@ namespace :profile do
   desc "profile email notifier with rubyprof"
   task :email do
 
-    require 'eventmachine'
-    # the redis/synchrony gems need to be required in this particular order, see
-    # the redis-rb README for details
-    require 'hiredis'
-    require 'em-synchrony'
-    require 'redis/connection/synchrony'
-    require 'redis'
-    require 'em-resque'
-    require 'em-resque/worker'
-
-    require 'flapjack/patches'
-    require 'flapjack/redis_pool'
-    require 'flapjack/notification/email'
-
+    require 'flapjack/email'
+    require 'flapjack/data/alert'
     require 'flapjack/data/contact'
     require 'flapjack/data/event'
     require 'flapjack/data/notification'
 
     FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'profile'
     config_env, redis_options = load_config
+    profile_pikelet(Flapjack::Gateways::Email, 'jabber', config_env['jabber_gateway'],
+      redis_options) {
 
-    FlapjackProfileResque = Class.new(Flapjack::Notification::Email)
-
-    profile_resque('email', config_env['email_notifier'], redis_options) {
-
-      # this executes in a separate thread, so no Fibery stuff is allowed
-      redis = Redis.new(redis_options.merge(:driver => 'ruby'))
+        # this executes in a separate thread, so no Fibery stuff is allowed
+        redis = Redis.new(redis_options.merge(:driver => 'ruby'))
 
-      event = Flapjack::Data::Event.new('type'    => 'service',
-                                        'state'   => 'critical',
-                                        'summary' => '100% packet loss',
-                                        'entity'  => 'clientx-app-01',
-                                        'check'   => 'ping')
-      notification = Flapjack::Data::Notification.for_event(event)
+        event = Flapjack::Data::Event.new('type'    => 'service',
+                                          'state'   => 'critical',
+                                          'summary' => '100% packet loss',
+                                          'entity'  => 'clientx-app-01',
+                                          'check'   => 'ping')
+        notification = Flapjack::Data::Notification.for_event(event)
 
-      contact = Flapjack::Data::Contact.find_by_id('1000', :redis => redis)
+        contact = Flapjack::Data::Contact.find_by_id('1000', :redis => redis)
 
-      RESQUE_REPETITIONS.times do
-        notification.messages(:contacts => [contact]).each do |msg|
-          Resque.enqueue_to(config_env['email_notifier']['queue'],
-            FlapjackProfileResque, msg.contents)
+        REPETITIONS.times do |n|
+          notification.messages(:contacts => [contact]).each do |msg|
+            contents = msg.contents
+            contents['event_count'] = n
+            Flapjack::Data::Alert.add(config_env['email_gateway']['queue'],
+              contents)
+          end
         end
-      end
 
-      redis.quit
+        redis.quit
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -84,21 +84,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,33 +98,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-resque
+  name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -255,16 +241,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -283,16 +269,16 @@ dependencies:
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -363,6 +349,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.2.1
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -381,8 +381,6 @@ files:
 - CONTRIBUTING.md
 - Dockerfile
 - Gemfile
-- Gemfile-ruby1.9
-- Gemfile-ruby1.9.lock
 - Guardfile
 - LICENCE
 - README.md
@@ -472,6 +470,7 @@ files:
 - lib/flapjack/gateways/oobetet.rb
 - lib/flapjack/gateways/pagerduty.rb
 - lib/flapjack/gateways/pagerduty/alert.text.erb
+- lib/flapjack/gateways/sms_gammu.rb
 - lib/flapjack/gateways/sms_messagenet.rb
 - lib/flapjack/gateways/sms_messagenet/alert.text.erb
 - lib/flapjack/gateways/sms_messagenet/rollup.text.erb
@@ -600,7 +599,6 @@ files:
 - src/flapjack/event_test.go
 - src/flapjack/transport.go
 - src/flapjack/transport_test.go
-- tasks/benchmarks.rake
 - tasks/entities.rake
 - tasks/events.rake
 - tasks/profile.rake
@@ -642,7 +640,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Intelligent, scalable, distributed monitoring notification system.

data/Gemfile-ruby1.9

@@ -1,30 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :name => 'flapjack'
-
-group :development do
-  gem 'ruby-prof'
-end
-
-group :test do
-  gem 'rspec', '~> 3.0'
-  gem 'cucumber', '>= 2.0.0.beta.3'
-  gem 'delorean'
-  gem 'rack-test'
-  gem 'pact'
-  gem 'async_rack_test', '>= 0.0.5'
-  gem 'resque_spec'
-  gem 'webmock'
-  gem 'guard'
-  gem 'rb-fsevent'
-  gem 'guard-rspec'
-  gem 'guard-cucumber'
-  gem 'fuubar'
-  gem 'simplecov', :require => false
-
-  # # Not compiling under 1.9.3-p550 anyway
-  # if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
-  #   gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
-  #   gem 'perftools.rb'
-  # end
-end