flapjack 0.7.14 → 0.7.15

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

@@ -38,6 +38,8 @@ describe Flapjack::Gateways::Email, :logger => true do
                     'contact_last_name'   => 'Smith',
                     'state'               => 'ok',
                     'summary'             => 'smile',
+                    'last_state'          => 'problem',
+                    'last_summary'        => 'frown',
                     'time'                => Time.now.to_i,
                     'event_id'            => 'example.com:ping'}
 

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

@@ -63,10 +63,11 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
     entity_check = mock(Flapjack::Data::EntityCheck)
     entity_check.should_receive(:in_unscheduled_maintenance?)
-    entity_check.should_receive(:create_acknowledgement).
-      with('summary' => 'fixing now', 'acknowledgement_id' => '876', 'duration' => (90 * 60))
-    entity_check.should_receive(:entity_name).and_return('main-example.com')
-    entity_check.should_receive(:check).and_return('ping')
+
+    Flapjack::Data::Event.should_receive(:create_acknowledgement).
+      with('main-example.com', 'ping', :summary => 'fixing now',
+           :acknowledgement_id => '876',
+           :duration => (90 * 60), :redis => redis)
 
     Flapjack::Data::EntityCheck.should_receive(:for_event_id).
       with('main-example.com:ping', :redis => redis).

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

@@ -105,8 +105,9 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     entity_check = mock('entity_check')
     entity_check.should_receive(:check).and_return('PING')
     entity_check.should_receive(:contacts).and_return([contact])
-    entity_check.should_receive(:entity_name).exactly(2).times.and_return('foo-app-01.bar.net:PING')
-    entity_check.should_receive(:create_acknowledgement).with('summary' => 'Acknowledged on PagerDuty')
+    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)
 
     Flapjack::Data::Global.should_receive(:unacknowledged_failing_checks).and_return([entity_check])
 

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

@@ -56,9 +56,9 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     ec.should_receive(:state).and_return('ok')
     ec.should_receive(:last_update).and_return(time - (3 * 60 * 60))
     ec.should_receive(:last_change).and_return(time - (3 * 60 * 60))
-    ec.should_receive(:last_problem_notification).and_return(time - ((3 * 60 * 60) + (5 * 60)))
-    ec.should_receive(:last_recovery_notification).and_return(time - (3 * 60 * 60))
-    ec.should_receive(:last_acknowledgement_notification).and_return(nil)
+    ec.should_receive(:last_notification_for_state).with(:problem).and_return({:timestamp => time - ((3 * 60 * 60) + (5 * 60))})
+    ec.should_receive(:last_notification_for_state).with(:recovery).and_return({:timestamp => time - (3 * 60 * 60)})
+    ec.should_receive(:last_notification_for_state).with(:acknowledgement).and_return({:timestamp => nil})
     ec.should_receive(:in_scheduled_maintenance?).and_return(false)
     ec.should_receive(:in_unscheduled_maintenance?).and_return(false)
   end
@@ -111,16 +111,17 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   it "shows the state of a check for an entity" do
-    time = Time.now.to_i
+    time = Time.now
+    Time.should_receive(:now).exactly(4).times.and_return(time)
 
-    last_notifications = {:problem         => time - ((3 * 60 * 60) + (5 * 60)),
-                          :recovery        => time - (3 * 60 * 60),
-                          :acknowledgement => nil }
+    last_notifications = {:problem         => {:timestamp => time.to_i - ((3 * 60 * 60) + (5 * 60)), :summary => 'prob'},
+                          :recovery        => {:timestamp => time.to_i - (3 * 60 * 60), :summary => nil},
+                          :acknowledgement => {:timestamp => nil, :summary => nil} }
 
     expect_check_stats
     entity_check.should_receive(:state).and_return('ok')
-    entity_check.should_receive(:last_update).and_return(time - (3 * 60 * 60))
-    entity_check.should_receive(:last_change).and_return(time - (3 * 60 * 60))
+    entity_check.should_receive(:last_update).and_return(time.to_i - (3 * 60 * 60))
+    entity_check.should_receive(:last_change).and_return(time.to_i - (3 * 60 * 60))
     entity_check.should_receive(:summary).and_return('all good')
     entity_check.should_receive(:details).and_return('seriously, all very wonderful')
     entity_check.should_receive(:last_notifications_of_each_type).and_return(last_notifications)
@@ -130,6 +131,9 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     entity_check.should_receive(:current_maintenance).with(:scheduled => false).and_return(false)
     entity_check.should_receive(:contacts).and_return([])
 
+    entity_check.should_receive(:historical_states).
+      with(nil, time.to_i, :order => 'desc', :limit => 20).and_return([])
+
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => redis).and_return(entity)
 
@@ -165,10 +169,11 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', :redis => redis).and_return(entity_check)
 
-    entity_check.should_receive(:create_acknowledgement).
-      with(an_instance_of(Hash))
+    Flapjack::Data::Event.should_receive(:create_acknowledgement).
+      with(entity_name, 'ping', :summary => "", :duration => (4 * 60 * 60),
+           :acknowledgement_id => '1234', :redis => redis)
 
-    post "/acknowledgements/#{entity_name_esc}/ping"
+    post "/acknowledgements/#{entity_name_esc}/ping?acknowledgement_id=1234"
     last_response.status.should == 302
   end
 

data/spec/lib/flapjack/pikelet_spec.rb

@@ -10,6 +10,8 @@ describe Flapjack::Pikelet do
 
   let(:fiber) { mock(Fiber) }
 
+  let(:time) { Time.now }
+
   before do
     Flapjack::Pikelet::Resque.class_variable_set(:@@resque_pool, nil)
   end
@@ -22,13 +24,14 @@ describe Flapjack::Pikelet do
     executive = mock('executive')
     executive.should_receive(:start)
     Flapjack::Executive.should_receive(:new).with(:config => config,
-      :redis_config => redis_config, :logger => logger).and_return(executive)
+        :redis_config => redis_config, :boot_time => time, :logger => logger).
+      and_return(executive)
 
     fiber.should_receive(:resume)
     Fiber.should_receive(:new).and_yield.and_return(fiber)
 
     pik = Flapjack::Pikelet.create('executive', :config => config,
-      :redis_config => redis_config)
+      :redis_config => redis_config, :boot_time => time)
     pik.should be_a(Flapjack::Pikelet::Generic)
     pik.start
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -398,7 +398,6 @@ files:
 - bin/flapper
 - bin/receive-events
 - bin/simulate-failed-check
-- config.ru
 - dist/etc/init.d/flapjack
 - dist/etc/init.d/flapjack-nagios-receiver
 - dist/etc/init.d/flapper
@@ -554,7 +553,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1257649684215176614
+      hash: 3712563231395847463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -563,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1257649684215176614
+      hash: 3712563231395847463
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/config.ru

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'bundler'
-Bundler.require(:default)
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
-require 'flapjack/web'
-
-use Flapjack::Web
-run Sinatra::Application