flapjack 0.6.30 → 0.6.31

data/lib/flapjack/api/entity_check_presenter.rb

@@ -29,7 +29,8 @@ module Flapjack
         hist_states.each_with_index do |obj, index|
           if (index == 0)
             # initial
-            obj[:start_time] = [obj.delete(:timestamp), start_time].max
+            ts = obj.delete(:timestamp)
+            obj[:start_time] = start_time ? [ts, start_time].max : ts
             obj[:end_time]   = hist_states[index + 1][:timestamp]
           elsif index == (num_states - 1)
             # last
@@ -40,7 +41,7 @@ module Flapjack
             obj[:start_time] = obj.delete(:timestamp)
             obj[:end_time]   = hist_states[index + 1][:timestamp]
           end
-          obj[:duration] = obj[:end_time] - obj[:start_time]
+          obj[:duration] = obj[:end_time] ? (obj[:end_time] - obj[:start_time]) : nil
         end
 
         hist_states.reject {|obj| obj[:state] == 'ok'}
@@ -159,11 +160,11 @@ module Flapjack
             total_secs.each_pair do |st, ts|
               percentages[st] = (total_secs[st] * 100.0) / (end_time.to_f - start_time.to_f)
             end
+            total_secs['ok'] = (end_time - start_time) - total_secs.values.reduce(:+)
+            percentages['ok'] = 100 - percentages.values.reduce(:+)
           end
         end
 
-        total_secs['ok'] = (end_time - start_time) - total_secs.values.reduce(:+)
-        percentages['ok'] = 100 - percentages.values.reduce(:+)
         {:total_seconds => total_secs, :percentages => percentages, :downtime => outs}
       end
 

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/api/entity_check_presenter_spec.rb

@@ -56,6 +56,22 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     # TODO check the data in those hashes
   end
 
+  it "returns the same list of outage hashes with no start and end time set" do
+    entity_check.should_receive(:historical_states).
+      with(nil, nil).and_return(states)
+
+    entity_check.should_receive(:historical_state_before).
+      with(time - (4 * 60 * 60)).and_return(nil)
+
+    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    outages = ecp.outages(nil, nil)
+    outages.should_not be_nil
+    outages.should be_an(Array)
+    outages.should have(4).time_ranges
+
+    # TODO check the data in those hashes
+  end
+
   it "a list of unscheduled maintenances for an entity check" do
     entity_check.should_receive(:maintenances).
       with(time - (12 * 60 * 60), time, :scheduled => false).and_return(maintenances)
@@ -88,7 +104,7 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     # TODO check the data in those hashes
   end
 
-  it "returns downtime and percentage for an entity check" do
+  it "returns downtime and percentage for a downtime check" do
     entity_check.should_receive(:historical_states).
       with(time - (12 * 60 * 60), time).and_return(states)
 
@@ -117,4 +133,27 @@ describe 'Flapjack::API::EntityCheck::Presenter' do
     downtimes[:downtime].should have(4).time_ranges
   end
 
+  it "returns downtime (but no percentage) for an unbounded downtime check" do
+    entity_check.should_receive(:historical_states).
+      with(nil, nil).and_return(states)
+
+    entity_check.should_receive(:historical_state_before).
+      with(time - (4 * 60 * 60)).and_return(nil)
+
+    entity_check.should_receive(:maintenances).
+      with(nil, nil, :scheduled => true).and_return(maintenances)
+
+    ecp = Flapjack::API::EntityCheckPresenter.new(entity_check)
+    downtimes = ecp.downtime(nil, nil)
+
+    # 22 minutes, 3 + 8 + 11
+    downtimes.should be_a(Hash)
+    downtimes[:total_seconds].should == {'critical' => (22 * 60)}
+    downtimes[:percentages].should == {'critical' => nil}
+    downtimes[:downtime].should be_an(Array)
+    # the last outage gets split by the intervening maintenance period,
+    # but the fully covered one gets removed.
+    downtimes[:downtime].should have(4).time_ranges
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.30
+  version: 0.6.31
   prerelease: 
 platform: ruby
 authors: