flapjack 0.7.28 → 0.7.29

data/lib/flapjack/pikelet.rb

@@ -92,6 +92,15 @@ module Flapjack
       def stop
         @status = 'stopping'
       end
+
+      def configure_resque
+        unless ::Resque.instance_variable_defined?('@flapjack_pool') && !::Resque.instance_variable_get('@flapjack_pool').nil?
+          resque_pool = Flapjack::RedisPool.new(:config => @redis_config)
+          ::Resque.instance_variable_set('@flapjack_pool', resque_pool)
+          ::Resque.redis = resque_pool
+        end
+      end
+
     end
 
     class Generic < Flapjack::Pikelet::Base
@@ -111,6 +120,9 @@ module Flapjack
 
       def initialize(type, pikelet_klass, opts = {})
         super(type, pikelet_klass, opts)
+
+        configure_resque if type == 'notifier'
+
         @pikelet = @klass.new(opts.merge(:logger => @logger))
       end
 
@@ -138,6 +150,7 @@ module Flapjack
         return @status unless 'stopping'.eql?(@status)
         @status = 'stopped' if @fiber && !@fiber.alive?
       end
+
     end
 
     class Resque < Flapjack::Pikelet::Base
@@ -154,9 +167,10 @@ module Flapjack
       def initialize(type, pikelet_klass, opts = {})
         super(type, pikelet_klass, opts)
 
-        unless defined?(@@resque_pool) && !@@resque_pool.nil?
-          @@resque_pool = Flapjack::RedisPool.new(:config => @redis_config)
-          ::Resque.redis = @@resque_pool
+        configure_resque
+
+        # guard against another Resque pikelet having created the pool already
+        unless defined?(@@redis_connection) && !@@redis_connection.nil?
           @@redis_connection = Flapjack::RedisPool.new(:config => @redis_config)
         end
 

data/lib/flapjack/processor.rb

@@ -66,7 +66,6 @@ module Flapjack
         @redis.hset('event_counters', 'action', 0)
       end
 
-      #@redis.zadd('executive_instances', boot_time.to_i, @instance_id)
       @redis.hset("executive_instance:#{@instance_id}", 'boot_time', boot_time.to_i)
       @redis.hset("event_counters:#{@instance_id}", 'all', 0)
       @redis.hset("event_counters:#{@instance_id}", 'ok', 0)

data/lib/flapjack/redis_pool.rb

@@ -22,4 +22,4 @@ module Flapjack
     end
 
   end
-end
+end

data/lib/flapjack/utility.rb

@@ -4,6 +4,7 @@ module Flapjack
   module Utility
 
     def time_period_in_words(period)
+      return "0 seconds" unless period.is_a?(Integer) && period > 0
       period_mm, period_ss  = period.divmod(60)
       period_hh, period_mm  = period_mm.divmod(60)
       period_dd, period_hh  = period_hh.divmod(24)
@@ -68,6 +69,18 @@ module Flapjack
       Hash[ *( key_value_pairs.flatten(1) )]
     end
 
+    # copied from ActiveSupport
+    def truncate(str, length, options = {})
+      text = str.dup
+      options[:omission] ||= "..."
+
+      length_with_room_for_omission = length - options[:omission].length
+      stop = options[:separator] ?
+        (text.rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission
+
+      (text.length > length ? text[0...stop] + options[:omission] : text).to_s
+    end
+
     private
 
     def plural_s(value)

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.7.28"
+  VERSION = "0.7.29"
 end

data/spec/lib/flapjack/data/contact_spec.rb

@@ -37,7 +37,7 @@ describe Flapjack::Data::Contact, :redis => true do
 
   before(:each) do
     Flapjack::Data::Contact.add( {
-        'id'         => '362',
+        'id'         => 'c362',
         'first_name' => 'John',
         'last_name'  => 'Johnson',
         'email'      => 'johnj@example.com',
@@ -53,7 +53,7 @@ describe Flapjack::Data::Contact, :redis => true do
       :redis => @redis)
 
     Flapjack::Data::Contact.add( {
-        'id'         => '363',
+        'id'         => 'c363_a-f@42%*',
         'first_name' => 'Jane',
         'last_name'  => 'Janeley',
         'email'      => 'janej@example.com',
@@ -78,13 +78,13 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "finds a contact by id" do
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     contact.should_not be_nil
     contact.name.should == "John Johnson"
   end
 
   it "adds a contact with the same id as an existing one, clears notification rules" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     contact.should_not be_nil
 
     contact.add_notification_rule(notification_rule_data)
@@ -93,13 +93,13 @@ describe Flapjack::Data::Contact, :redis => true do
     nr.should_not be_nil
     nr.should have(2).notification_rules
 
-    Flapjack::Data::Contact.add({'id'         => '363',
+    Flapjack::Data::Contact.add({'id'         => 'c363_a-f@42%*',
                                  'first_name' => 'Smithy',
                                  'last_name'  => 'Smith',
                                  'email'      => 'smithys@example.com'},
                                  :redis       => @redis)
 
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     contact.should_not be_nil
     contact.name.should == 'Smithy Smith'
     rules = contact.notification_rules
@@ -108,14 +108,14 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "updates a contact and clears their media settings" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
 
     contact.update('media' => {})
     contact.media.should be_empty
   end
 
   it "updates a contact, does not clear notification rules" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     contact.should_not be_nil
 
     contact.add_notification_rule(notification_rule_data)
@@ -136,7 +136,7 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "adds a notification rule for a contact" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     contact.should_not be_nil
 
     expect {
@@ -145,7 +145,7 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "removes a notification rule from a contact" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     contact.should_not be_nil
 
     rule = contact.add_notification_rule(notification_rule_data)
@@ -156,12 +156,12 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "creates a general notification rule for a pre-existing contact if none exists" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
 
-    @redis.smembers("contact_notification_rules:363").each do |rule_id|
-      @redis.srem("contact_notification_rules:363", rule_id)
+    @redis.smembers("contact_notification_rules:c363_a-f@42%*").each do |rule_id|
+      @redis.srem("contact_notification_rules:c363_a-f@42%*", rule_id)
     end
-    @redis.smembers("contact_notification_rules:363").should be_empty
+    @redis.smembers("contact_notification_rules:c363_a-f@42%*").should be_empty
 
     rules = contact.notification_rules
     rules.should have(1).rule
@@ -174,7 +174,7 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "creates a general notification rule for a pre-existing contact if the existing general one was changed" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     rules = contact.notification_rules
     rules.should have(1).notification_rule
     rule = rules.first
@@ -187,14 +187,14 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "deletes a contact by id, including linked entities, checks, tags and notification rules" do
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     contact.add_tags('admin')
 
     entity_name = 'abc-123'
 
     entity = Flapjack::Data::Entity.add({'id'   => '5000',
                                          'name' => entity_name,
-                                         'contacts' => ['362']},
+                                         'contacts' => ['c362']},
                                          :redis => @redis)
 
     expect {
@@ -213,7 +213,7 @@ describe Flapjack::Data::Contact, :redis => true do
 
     Flapjack::Data::Entity.add({'id'   => '5000',
                                 'name' => entity_name,
-                                'contacts' => ['362']},
+                                'contacts' => ['c362']},
                                 :redis => @redis)
 
     ec = Flapjack::Data::EntityCheck.for_entity_name(entity_name, 'PING', :redis => @redis)
@@ -221,7 +221,7 @@ describe Flapjack::Data::Contact, :redis => true do
     ec.update_state('ok', :timestamp => t, :summary => 'a')
     ec.last_update = t
 
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     eandcs = contact.entities(:checks => true)
     eandcs.should_not be_nil
     eandcs.should be_an(Array)
@@ -239,7 +239,7 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "returns pagerduty credentials for a contact" do
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     credentials = contact.pagerduty_credentials
     credentials.should_not be_nil
     credentials.should be_a(Hash)
@@ -249,41 +249,56 @@ describe Flapjack::Data::Contact, :redis => true do
                            'password'    => 'very_secure'}
   end
 
+  it "sets pagerduty credentials for a contact" do
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
+    contact.set_pagerduty_credentials('service_key' => '567890123456789012345678',
+                                      'subdomain'   => 'eggs',
+                                      'username'    => 'flapjack',
+                                      'password'    => 'tomato')
+
+    @redis.hget('contact_media:c362', 'pagerduty').should == '567890123456789012345678'
+    @redis.hgetall('contact_pagerduty:c362').should == {
+      'subdomain'   => 'eggs',
+      'username'    => 'flapjack',
+      'password'    => 'tomato'
+    }
+  end
+
   it "sets the interval for a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     contact.set_interval_for_media('email', 42)
     email_interval_raw = @redis.hget("contact_media_intervals:#{contact.id}", 'email')
     email_interval_raw.should == '42'
   end
 
   it "returns the interval for a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     email_interval = contact.interval_for_media('email')
     email_interval.should == 60
   end
 
   it "returns default 15 mins for interval for a contact's media that has no set interval" do
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     email_interval = contact.interval_for_media('email')
     email_interval.should == 900
   end
 
   it "removes the interval for a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     contact.set_interval_for_media('email', nil)
     email_interval_raw = @redis.hget("contact_media_intervals:#{contact.id}", 'email')
     email_interval_raw.should be_nil
   end
 
   it "sets the rollup threshold for a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     email_rollup_threshold = contact.set_rollup_threshold_for_media('email', 3)
     email_rollup_threshold_raw = @redis.hget("contact_media_rollup_thresholds:#{contact.id}", 'email')
     email_rollup_threshold_raw.should == '3'
   end
 
   it "returns the rollup threshold for a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     email_rollup_threshold = contact.rollup_threshold_for_media('email')
     email_rollup_threshold.should_not be_nil
     email_rollup_threshold.should be_a(Integer)
@@ -291,21 +306,21 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "removes the rollup threshold for a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     email_rollup_threshold = contact.set_rollup_threshold_for_media('email', nil)
     email_rollup_threshold_raw = @redis.hget("contact_media_rollup_thresholds:#{contact.id}", 'email')
     email_rollup_threshold_raw.should be_nil
   end
 
   it "sets the address for a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     contact.set_address_for_media('email', 'spongebob@example.com')
     email_address_raw = @redis.hget("contact_media:#{contact.id}", 'email')
     email_address_raw.should == 'spongebob@example.com'
   end
 
   it "removes a contact's media" do
-    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('c363_a-f@42%*', :redis => @redis)
     contact.remove_media('email')
     email_address_raw = @redis.hget("contac_media:#{contact.id}", 'email')
     email_address_raw.should be_nil

data/spec/lib/flapjack/gateways/api/contact_methods_spec.rb

@@ -434,7 +434,27 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
               'interval'         => alt_media_intervals['sms'],
               'rollup_threshold' => alt_media_rollup_thresholds['sms']}
 
-    put "/contacts/#{contact.id}/media/sms", {:address => '04987654321', :interval => '200', :rollup_threshold => '5'}
+    put "/contacts/#{contact.id}/media/sms", :address => '04987654321',
+      :interval => '200', :rollup_threshold => '5'
+    last_response.should be_ok
+    last_response.body.should be_json_eql(result.to_json)
+  end
+
+  it "updates a contact's pagerduty media credentials" do
+    result = {'service_key' => "flapjacktest@conference.jabber.sausage.net",
+              'subdomain'   => "sausage.pagerduty.com",
+              'username'    => "sausage@example.com",
+              'password'    => "sausage"}
+
+    contact.should_receive(:set_pagerduty_credentials).with(result)
+    contact.should_receive(:pagerduty_credentials).and_return(result)
+    Flapjack::Data::Contact.should_receive(:find_by_id).
+      with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
+
+    put "/contacts/#{contact.id}/media/pagerduty", :service_key => result['service_key'],
+      :subdomain => result['subdomain'], :username => result['username'],
+      :password => result['password']
+
     last_response.should be_ok
     last_response.body.should be_json_eql(result.to_json)
   end
@@ -443,7 +463,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    put "/contacts/#{contact.id}/media/sms", {:address => '04987654321', :interval => '200'}
+    put "/contacts/#{contact.id}/media/sms", :address => '04987654321', :interval => '200'
     last_response.should be_forbidden
   end
 
@@ -451,7 +471,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    put "/contacts/#{contact.id}/media/sms", {:interval => '200'}
+    put "/contacts/#{contact.id}/media/sms", :interval => '200'
     last_response.should be_forbidden
   end
 
@@ -469,7 +489,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    put "/contacts/#{contact.id}/media/sms", {:address => '04987654321'}
+    put "/contacts/#{contact.id}/media/sms", :address => '04987654321'
     last_response.should be_ok
   end
 

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

@@ -7,13 +7,8 @@ describe Flapjack::Gateways::Email, :logger => true do
     email = double('email')
 
     entity_check = double(Flapjack::Data::EntityCheck)
-    entity_check.should_receive(:in_scheduled_maintenance?).and_return(false)
-    entity_check.should_receive(:in_unscheduled_maintenance?).and_return(false)
     redis = double('redis')
 
-    Flapjack::Data::EntityCheck.should_receive(:for_event_id).
-      with('example.com:ping', :redis => redis).and_return(entity_check)
-
     # TODO better checking of what gets passed here
     EM::P::SmtpClient.should_receive(:send).with(
       hash_including(:host    => 'localhost',

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

@@ -177,10 +177,12 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
     blpop_count = 0
 
+    event_json = '{"notification_type":"problem","event_id":"main-example.com:ping",' +
+      '"state":"critical","summary":"!!!","duration":43,"state_duration":76}'
     redis.should_receive(:blpop).twice {
       blpop_count += 1
       if blpop_count == 1
-        ["jabber_notifications", %q{{"notification_type":"problem","event_id":"main-example.com:ping","state":"critical","summary":"!!!"}}]
+        ["jabber_notifications", event_json]
       else
         fj.instance_variable_set('@should_quit', true)
         ["jabber_notifications", %q{{"notification_type":"shutdown"}}]
@@ -192,6 +194,8 @@ describe Flapjack::Gateways::Jabber, :logger => true do
     fj.should_receive(:close)
 
     fj.start
+
+    @logger.errors.should be_empty
   end
 
 end

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

@@ -107,7 +107,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     entity_check.should_receive(:contacts).and_return([contact])
     entity_check.should_receive(:entity_name).exactly(2).times.and_return('foo-app-01.bar.net')
     Flapjack::Data::Event.should_receive(:create_acknowledgement).with('foo-app-01.bar.net', 'PING',
-      :summary => 'Acknowledged on PagerDuty', :redis => redis)
+      :summary => 'Acknowledged on PagerDuty', :duration => 14400, :redis => redis)
 
     Flapjack::Data::Global.should_receive(:unacknowledged_failing_checks).and_return([entity_check])
 
@@ -131,7 +131,8 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     redis.should_receive(:blpop).twice {
       blpop_count += 1
       if blpop_count == 1
-        ["pagerduty_notifications", %q{{"notification_type":"problem","event_id":"main-example.com:ping","state":"critical","summary":"!!!"}}]
+        ["pagerduty_notifications", '{"notification_type":"problem","event_id":"main-example.com:ping",' +
+          '"state":"critical","summary":"!!!","state_duration":120,"duration":30}']
       else
         fp.instance_variable_set('@should_quit', true)
         ["pagerduty_notifications", %q{{"notification_type":"shutdown"}}]
@@ -142,6 +143,8 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     fp.should_receive(:send_pagerduty_event)
 
     fp.start
+
+    @logger.errors.should be_empty
   end
 
   it "tests the pagerduty connection" do