flapjack 0.9.6 → 1.0.0rc1

data/lib/flapjack/redis_pool.rb

@@ -10,18 +10,14 @@ require 'redis'
 
 require 'em-synchrony/connection_pool'
 
-require 'flapjack/data/migration'
-
 module Flapjack
   class RedisPool < EventMachine::Synchrony::ConnectionPool
 
     def initialize(opts = {})
       config = opts.delete(:config)
-      @size  = opts[:size] || 5
+      @size = opts[:size] || 5
       super(:size => @size) {
-        redis = ::Redis.new(config)
-        Flapjack::Data::Migration.refresh_archive_index(:redis => redis)
-        redis
+        ::Redis.new(config)
       }
     end
 

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.9.6"
+  VERSION = "1.0.0rc1"
 end
 

data/spec/lib/flapjack/coordinator_spec.rb

@@ -33,7 +33,7 @@ describe Flapjack::Coordinator do
       and_return(processor)
 
     expect(EM).to receive(:stop)
-    expect(EM::Synchrony).to receive(:sleep) {
+    expect(EM::Synchrony).to receive(:sleep).and_return {
       fc.instance_variable_set('@received_signals', ['INT'])
     }
 
@@ -102,7 +102,7 @@ describe Flapjack::Coordinator do
       and_return(notifier)
 
     expect(EM).to receive(:stop)
-    expect(EM::Synchrony).to receive(:sleep) {
+    expect(EM::Synchrony).to receive(:sleep).and_return {
       fc.instance_variable_set('@received_signals', ['INT'])
     }
 
@@ -136,7 +136,7 @@ describe Flapjack::Coordinator do
       and_return(processor)
 
     expect(EM).to receive(:stop)
-    expect(EM::Synchrony).to receive(:sleep) {
+    expect(EM::Synchrony).to receive(:sleep).and_return {
       fc.instance_variable_set('@received_signals', ['INT'])
     }
 

data/spec/lib/flapjack/data/entity_check_spec.rb

@@ -180,7 +180,7 @@ describe Flapjack::Data::EntityCheck, :redis => true do
       expect(duration_curr).to eq(half_an_hour)
     end
 
-    it "ends an unscheduled maintenance period" do
+    it "ends an unscheduled maintenance period", :time => true do
       t = Time.now.to_i
       later_t = t + (15 * 60)
       ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
@@ -233,6 +233,7 @@ describe Flapjack::Data::EntityCheck, :redis => true do
       expect(duration).to eq(half_an_hour)
     end
 
+    # TODO this should probably enforce that it starts in the future
     it "creates a scheduled maintenance period covering the current time" do
       t = Time.now.to_i
       ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
@@ -254,11 +255,6 @@ describe Flapjack::Data::EntityCheck, :redis => true do
       expect(duration).not_to be_nil
       expect(duration).to be_a(Float)
       expect(duration).to eq(2 * (60 * 60))
-
-      ttl = @redis.ttl("#{name}:#{check}:scheduled_maintenance")
-      expect(ttl).to be_within(20).of(60 * 60) # 20-second margin of error,
-      # should be large enough for a slow machine running the test -- duration
-      # is considered to start at the begininng of the period
     end
 
     it "removes a scheduled maintenance period for a future time" do

data/spec/lib/flapjack/data/event_spec.rb

@@ -22,18 +22,11 @@ describe Flapjack::Data::Event do
                       'tags'     => ['dev'] }
   }
 
-  before(:each) do
-    Flapjack::Data::Event.instance_variable_set('@previous_base_time_str', nil)
-  end
-
   context 'class' do
 
     it "returns the next event (blocking, archiving)" do
       expect(mock_redis).to receive(:brpoplpush).
         with('events', /^events_archive:/, 0).and_return(event_data.to_json)
-      expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-      expect(mock_redis).to receive(:sadd).
-        with('known_events_archive_keys', /^events_archive:/)
       expect(mock_redis).to receive(:expire)
 
       result = Flapjack::Data::Event.next('events', :block => true,
@@ -53,9 +46,6 @@ describe Flapjack::Data::Event do
     it "returns the next event (non-blocking, archiving)" do
       expect(mock_redis).to receive(:rpoplpush).
         with('events', /^events_archive:/).and_return(event_data.to_json)
-      expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-      expect(mock_redis).to receive(:sadd).
-        with('known_events_archive_keys', /^events_archive:/)
       expect(mock_redis).to receive(:expire)
 
       result = Flapjack::Data::Event.next('events', :block => false,
@@ -76,9 +66,6 @@ describe Flapjack::Data::Event do
       bad_event_json = '{{{'
       expect(mock_redis).to receive(:brpoplpush).
         with('events', /^events_archive:/, 0).and_return(bad_event_json)
-      expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-      expect(mock_redis).to receive(:sadd).
-        with('known_events_archive_keys', /^events_archive:/)
       expect(mock_redis).to receive(:multi)
       expect(mock_redis).to receive(:lrem).with(/^events_archive:/, 1, bad_event_json)
       expect(mock_redis).to receive(:lpush).with(/^events_rejected:/, bad_event_json)
@@ -107,9 +94,6 @@ describe Flapjack::Data::Event do
         bad_event_data = event_data.clone
         bad_event_data.delete(required_key)
         bad_event_json = bad_event_data.to_json
-        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-        expect(mock_redis).to receive(:sadd).
-          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
         expect(mock_redis).to receive(:multi)
@@ -142,9 +126,6 @@ describe Flapjack::Data::Event do
         bad_event_json = bad_event_data.to_json
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
-        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-        expect(mock_redis).to receive(:sadd).
-          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:multi)
         expect(mock_redis).to receive(:lrem).with(/^events_archive:/, 1, bad_event_json)
         expect(mock_redis).to receive(:lpush).with(/^events_rejected:/, bad_event_json)
@@ -175,9 +156,6 @@ describe Flapjack::Data::Event do
         bad_event_data = event_data.clone
         bad_event_data[optional_key] = {'hello' => 'there'}
         bad_event_json = bad_event_data.to_json
-        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-        expect(mock_redis).to receive(:sadd).
-          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
         expect(mock_redis).to receive(:multi)
@@ -210,9 +188,6 @@ describe Flapjack::Data::Event do
       it "it matches case-insensitively for #{key} (archiving)" do
         case_event_data = event_data.clone
         case_event_data[key] = event_data[key].upcase
-        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-        expect(mock_redis).to receive(:sadd).
-          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(case_event_data.to_json)
         expect(mock_redis).to receive(:expire)
@@ -239,9 +214,6 @@ describe Flapjack::Data::Event do
       it "it accepts an event with a numeric #{key} key (archiving)" do
         num_event_data = event_data.clone
         num_event_data[key] = event_data[key].to_i.to_s
-        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-        expect(mock_redis).to receive(:sadd).
-          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(num_event_data.to_json)
         expect(mock_redis).to receive(:expire)
@@ -268,9 +240,6 @@ describe Flapjack::Data::Event do
         bad_event_json = bad_event_data.to_json
         expect(mock_redis).to receive(:brpoplpush).
           with('events', /^events_archive:/, 0).and_return(bad_event_json)
-        expect(Flapjack::Data::Migration).to receive(:purge_expired_archive_index).with(:redis => mock_redis)
-        expect(mock_redis).to receive(:sadd).
-          with('known_events_archive_keys', /^events_archive:/)
         expect(mock_redis).to receive(:multi)
         expect(mock_redis).to receive(:lrem).with(/^events_archive:/, 1, bad_event_json)
         expect(mock_redis).to receive(:lpush).with(/^events_rejected:/, bad_event_json)

data/spec/lib/flapjack/gateways/email_spec.rb

@@ -38,6 +38,115 @@ describe Flapjack::Gateways::Email, :logger => true do
     Flapjack::Gateways::Email.perform(notification)
   end
 
+  it "can have a full name in custom from email address" do
+    email = double('email')
+    redis = double('redis')
+
+    expect(EM::P::SmtpClient).to receive(:send).with(
+      hash_including(host: 'localhost',
+                     port: 25,
+                     from: "Full Name <from@example.org>")
+    ).and_return(email)
+
+    response = double(response)
+    expect(response).to receive(:"respond_to?").with(:code).and_return(true)
+    expect(response).to receive(:code).and_return(250)
+
+    expect(EM::Synchrony).to receive(:sync).with(email).and_return(response)
+
+    notification = {'notification_type'   => 'recovery',
+                    'contact_first_name'  => 'John',
+                    'contact_last_name'   => 'Smith',
+                    'state'               => 'ok',
+                    'state_duration'      => 2,
+                    'summary'             => 'smile',
+                    'last_state'          => 'problem',
+                    'last_summary'        => 'frown',
+                    'time'                => Time.now.to_i,
+                    'event_id'            => 'example.com:ping'}
+
+    config = {"smtp_config" => {'from' => 'Full Name <from@example.org>'}}
+    Flapjack::Gateways::Email.instance_variable_set('@config', config)
+    Flapjack::Gateways::Email.instance_variable_set('@redis', redis)
+    Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
+    Flapjack::Gateways::Email.start
+    Flapjack::Gateways::Email.perform(notification)
+  end
+
+  it "can have a custom reply-to address" do
+    email = double('email')
+    redis = double('redis')
+
+    expect(EM::P::SmtpClient).to receive(:send) { |message|
+      # NOTE No access to headers directly. Must be determined from message content
+      expect( message[:content] ).to include("Reply-To: reply-to@example.com")
+      # NOTE Ensure we haven't trashed any other arguments
+      expect( message[:host] ).to eql('localhost')
+      expect( message[:port] ).to eql(25)
+      expect( message[:from] ).to eql('from@example.org')
+    }.and_return(email)
+
+    response = double(response)
+    expect(response).to receive(:"respond_to?").with(:code).and_return(true)
+    expect(response).to receive(:code).and_return(250)
+
+    expect(EM::Synchrony).to receive(:sync).with(email).and_return(response)
+
+    notification = {'notification_type'   => 'recovery',
+                    'contact_first_name'  => 'John',
+                    'contact_last_name'   => 'Smith',
+                    'state'               => 'ok',
+                    'state_duration'      => 2,
+                    'summary'             => 'smile',
+                    'last_state'          => 'problem',
+                    'last_summary'        => 'frown',
+                    'time'                => Time.now.to_i,
+                    'event_id'            => 'example.com:ping'}
+
+    config = {"smtp_config" => {'from' => 'from@example.org', 'reply_to' => 'reply-to@example.com'}}
+
+    Flapjack::Gateways::Email.instance_variable_set('@config', config)
+    Flapjack::Gateways::Email.instance_variable_set('@redis', redis)
+    Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
+    Flapjack::Gateways::Email.start
+    Flapjack::Gateways::Email.perform(notification)
+  end
+
+  it "must default to from address if no reply-to given" do
+    email = double('email')
+    redis = double('redis')
+
+    expect(EM::P::SmtpClient).to receive(:send) { |message|
+      # NOTE No access to headers directly. Must be determined from message content
+      expect( message[:content] ).to include("Reply-To: from@example.org")
+    }.and_return(email)
+
+    response = double(response)
+    expect(response).to receive(:"respond_to?").with(:code).and_return(true)
+    expect(response).to receive(:code).and_return(250)
+
+    expect(EM::Synchrony).to receive(:sync).with(email).and_return(response)
+
+    notification = {'notification_type'   => 'recovery',
+                    'contact_first_name'  => 'John',
+                    'contact_last_name'   => 'Smith',
+                    'state'               => 'ok',
+                    'state_duration'      => 2,
+                    'summary'             => 'smile',
+                    'last_state'          => 'problem',
+                    'last_summary'        => 'frown',
+                    'time'                => Time.now.to_i,
+                    'event_id'            => 'example.com:ping'}
+
+    config = {"smtp_config" => {'from' => 'from@example.org'}}
+
+    Flapjack::Gateways::Email.instance_variable_set('@config', config)
+    Flapjack::Gateways::Email.instance_variable_set('@redis', redis)
+    Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
+    Flapjack::Gateways::Email.start
+    Flapjack::Gateways::Email.perform(notification)
+  end
+
   it "sends a mail with text, html parts and default from address" do
     email = double('email')
 

data/spec/lib/flapjack/gateways/jabber_spec.rb

@@ -3,14 +3,13 @@ require 'flapjack/gateways/jabber'
 
 describe Flapjack::Gateways::Jabber, :logger => true do
 
-  let(:config) { {'queue'       => 'jabber_notifications',
-                  'server'      => 'example.com',
-                  'port'        => '5222',
-                  'jabberid'    => 'flapjack@example.com',
-                  'password'    => 'password',
-                  'alias'       => 'flapjack',
-                  'identifiers' => ['@flapjack'],
-                  'rooms'       => ['flapjacktest@conference.example.com']
+  let(:config) { {'queue'    => 'jabber_notifications',
+                  'server'   => 'example.com',
+                  'port'     => '5222',
+                  'jabberid' => 'flapjack@example.com',
+                  'password' => 'password',
+                  'alias'    => 'flapjack',
+                  'rooms'    => ['flapjacktest@conference.example.com']
                  }
   }
 
@@ -27,11 +26,10 @@ describe Flapjack::Gateways::Jabber, :logger => true do
     expect(fj).to receive(:register_handler).with(:ready).and_yield(stanza)
     expect(fj).to receive(:on_ready).with(stanza)
 
-    body_matchers = [{:body => /^@flapjack[:\s]/}, {:body => /^flapjack[:\s]/}]
-    expect(fj).to receive(:register_handler).with(:message, :groupchat?, body_matchers).and_yield(stanza)
+    expect(fj).to receive(:register_handler).with(:message, :groupchat?, :body => /^flapjack:\s+/).and_yield(stanza)
     expect(fj).to receive(:on_groupchat).with(stanza)
 
-    expect(fj).to receive(:register_handler).with(:message, :chat?, :body).and_yield(stanza)
+    expect(fj).to receive(:register_handler).with(:message, :chat?).and_yield(stanza)
     expect(fj).to receive(:on_chat).with(stanza)
 
     expect(fj).to receive(:register_handler).with(:disconnected).and_yield(stanza)
@@ -54,8 +52,9 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   end
 
   it "receives an acknowledgement message" do
-    expect(stanza).to receive(:body).twice.and_return('flapjack: ACKID 1f8ac10f fixing now duration: 90m')
+    expect(stanza).to receive(:body).and_return('flapjack: ACKID 1f8ac10f fixing now duration: 90m')
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
@@ -86,11 +85,12 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   end
 
   it "strips XML tags from the received message" do
-    expect(stanza).to receive(:body).twice.
+    expect(stanza).to receive(:body).
       and_return('flapjack: tell me about <span style="text-decoration: underline;">' +
                  '<a href="http://example.org/">example.org</a></span>')
 
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
@@ -119,10 +119,11 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   end
 
   it "handles a message with a newline in it" do
-    expect(stanza).to receive(:body).twice.
+    expect(stanza).to receive(:body).
       and_return("flapjack: tell me about \nexample.com")
 
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
@@ -151,8 +152,9 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   end
 
   it "receives a message it doesn't understand" do
-    expect(stanza).to receive(:body).twice.and_return('flapjack: hello!')
+    expect(stanza).to receive(:body).once.and_return('flapjack: hello!')
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
@@ -174,7 +176,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
     expect(EventMachine::Synchrony).to receive(:sleep).with(5).exactly(1).times
     expect(EventMachine::Synchrony).to receive(:sleep).with(2).exactly(3).times
-    expect(fj).to receive(:connect).exactly(4).times {
+    expect(fj).to receive(:connect).exactly(4).times.and_return {
       attempts +=1
       raise StandardError.new unless attempts > 3
     }

data/spec/lib/flapjack/gateways/jsonapi/check_presenter_spec.rb

@@ -47,10 +47,8 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(time - (5 * 60 * 60), time - (2 * 60 * 60))
     expect(outages).not_to be_nil
-    expect(outages).to be_a(Hash)
-    expect(outages).to have_key(:outages)
-    expect(outages[:outages]).to be_an(Array)
-    expect(outages[:outages].size).to eq(4)
+    expect(outages).to be_an(Array)
+    expect(outages.size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -65,10 +63,8 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_a(Hash)
-    expect(outages).to have_key(:outages)
-    expect(outages[:outages]).to be_an(Array)
-    expect(outages[:outages].size).to eq(4)
+    expect(outages).to be_an(Array)
+    expect(outages.size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -86,10 +82,8 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_a(Hash)
-    expect(outages).to have_key(:outages)
-    expect(outages[:outages]).to be_an(Array)
-    expect(outages[:outages].size).to eq(3)
+    expect(outages).to be_an(Array)
+    expect(outages.size).to eq(3)
   end
 
   it "returns a (small) outage hash for a single state change" do
@@ -101,10 +95,8 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_a(Hash)
-    expect(outages).to have_key(:outages)
-    expect(outages[:outages]).to be_an(Array)
-    expect(outages[:outages].size).to eq(1)
+    expect(outages).to be_an(Array)
+    expect(outages.size).to eq(1)
   end
 
   it "a list of unscheduled maintenances for an entity check" do
@@ -117,10 +109,8 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     unsched_maint = ecp.unscheduled_maintenance(time - (12 * 60 * 60), time)
 
-    expect(unsched_maint).to be_a(Hash)
-    expect(unsched_maint).to have_key(:unscheduled_maintenances)
-    expect(unsched_maint[:unscheduled_maintenances]).to be_an(Array)
-    expect(unsched_maint[:unscheduled_maintenances].size).to eq(4)
+    expect(unsched_maint).to be_an(Array)
+    expect(unsched_maint.size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -135,10 +125,8 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     sched_maint = ecp.scheduled_maintenance(time - (12 * 60 * 60), time)
 
-    expect(sched_maint).to be_a(Hash)
-    expect(sched_maint).to have_key(:scheduled_maintenances)
-    expect(sched_maint[:scheduled_maintenances]).to be_an(Array)
-    expect(sched_maint[:scheduled_maintenances].size).to eq(4)
+    expect(sched_maint).to be_an(Array)
+    expect(sched_maint.size).to eq(4)
 
     # TODO check the data in those hashes
   end

data/spec/lib/flapjack/gateways/pagerduty_spec.rb

@@ -182,7 +182,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
 
     EM.synchrony do
       ret = fp.send(:send_pagerduty_event, evt)
-      expect(ret).not_to be_nil
+      expect { ret }.not_to be_nil
       expect(ret).to eq([200, nil])
       EM.stop
     end

data/spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe 'web/views/check.html.erb', :erb_view => true do
 
   it "should escape unsafe check characters in URIs" do
+    @base_url = 'http://www.example.com/flapjack/'
+
     @entity = 'abc-xyz-01'
     @check  = 'Disk / Utilisation'
     @last_notifications = {}

data/spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe 'web/views/contact.html.erb', :erb_view => true do
 
   it "should escape unsafe check characters in URI parameters" do
+    @base_url = 'http://www.example.com/flapjack/'
+
     @contact = double('contact')
     expect(@contact).to receive(:media)
     expect(@contact).to receive(:name).and_return('Aeschylus')

data/spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe 'web/views/checks.html.erb', :erb_view => true do
 
   it "should escape unsafe check characters in URI parameters" do
+    @base_url = 'http://www.example.com/flapjack/'
+
     @states = {'abc-xyz-01' => [['Disk / Utilisation', 'OK', 'Looking good', '-', '-', false, false, nil, nil]]}
     @entities_sorted = ['abc-xyz-01']
     @adjective = "all"