flapjack 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce6f0286611137f8e6d18bcbef9ffd1b91684aa
-  data.tar.gz: 6aeb2801bc9d8e29975976840a1d2011bcb15123
+  metadata.gz: 00e9afa87734c98245ef9b370a726bd5e5e4a9d7
+  data.tar.gz: 4852d02b41ec46f45bfe2fbb44cd18e4ad95a0a5
 SHA512:
-  metadata.gz: 37798bf1be6e3edc8fb3d8d2a19f3a85232e462b12f110d9d821664089204d9f3dab505c6ed8c13e39f80c5a160f1da1394e9af31933c6a5bd2fb586f760e42c
-  data.tar.gz: 6c3645d45731fe5bc4c699e1460ed13524a169611d24ca19b7ab8902a9b3ba23ab701ddb97fce3db8609acfc410e5ecf159f5c4a09842b569504297b74eca6e2
+  metadata.gz: d938e90fe44d654985e9bba3ec644f43a71bc172efb7e2cce39ae0dd38239fc164741ae4f4d2a57b0d88f85dd87f0ac4a699ea9fa30740ee6224b9186f738b6e
+  data.tar.gz: f37d7d6a16fd859fb2011cbc48fa5e0f8c82ec994e9238844921f4a49be28b267923beabf98723e1e1a5ccfc824a98d4cb8c3736b3dbe68844ff93e8b15f51a3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.8.4 - 2014-01-31
+- Bug: The scheduled maintenance periods table on the checks page is messed up gh-427 (@jswoods)
+- Bug: api current check state shows check summary and details from last state change gh-431 (@ali-graham)
+
 # 0.8.3 - 2014-01-24
 - Feature: Fix background color for failing events for entity page gh-425 (@jswoods)
 - Feature: Enabled sort and filter options in the flapjack UI gh-418 (@jswoods)

data/lib/flapjack/data/entity_check.rb

@@ -486,13 +486,11 @@ module Flapjack
       end
 
       def summary
-        timestamp = @redis.lindex("#{@key}:states", -1)
-        @redis.get("#{@key}:#{timestamp}:summary")
+        @redis.hget("check:#{@key}", 'summary')
       end
 
       def details
-        timestamp = @redis.lindex("#{@key}:states", -1)
-        @redis.get("#{@key}:#{timestamp}:details")
+        @redis.hget("check:#{@key}", 'details')
       end
 
       # Returns a list of states for this entity check, sorted by timestamp.

data/lib/flapjack/gateways/web/views/check.html.erb

@@ -306,9 +306,9 @@
           <% end %>
         </td>
       </tr>
+    <% end %>
     </table>
   </div><!-- col-md-12 -->
-  <% end %>
 <% else %>
   <p>No maintenance is scheduled</p>
 <% end %>

data/lib/flapjack/version.rb

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

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

@@ -440,13 +440,15 @@ describe Flapjack::Data::EntityCheck, :redis => true do
 
   it "does not update state with a repeated state value" do
     ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
-    ec.update_state('critical', :summary => 'small problem')
+    ec.update_state('critical', :summary => 'small problem', :details => 'none')
     changed_at = @redis.hget("check:#{name}:#{check}", 'last_change')
-    summary = @redis.hget("check:#{name}:#{check}", 'summary')
+    summary = ec.summary
+    details = ec.details
 
-    ec.update_state('critical', :summary => 'big problem')
+    ec.update_state('critical', :summary => 'big problem', :details => 'some')
     new_changed_at = @redis.hget("check:#{name}:#{check}", 'last_change')
-    new_summary = @redis.hget("check:#{name}:#{check}", 'summary')
+    new_summary = ec.summary
+    new_details = ec.details
 
     expect(changed_at).not_to be_nil
     expect(new_changed_at).not_to be_nil
@@ -457,6 +459,12 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     expect(new_summary).not_to eq(summary)
     expect(summary).to eq('small problem')
     expect(new_summary).to eq('big problem')
+
+    expect(details).not_to be_nil
+    expect(new_details).not_to be_nil
+    expect(new_details).not_to eq(details)
+    expect(details).to eq('none')
+    expect(new_details).to eq('some')
   end
 
   def time_before(t, min, sec = 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante