flapjack 0.7.8 → 0.7.9

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Flapjack Changelog
 
+# 0.7.9 - 2013-06-04
+- Feature: Include summary and details in the /status API call gh-179 (@ali-graham)
+
 # 0.7.8 - 2013-05-30
 - Feature: support multiline check output (thanks @bs-github) gh-100 (@jessereynolds)
 - Bug: notification rule with no entities or entity tags not being allowed gh-193 (@jessereynolds)

data/lib/flapjack/gateways/api.rb

@@ -584,14 +584,16 @@ module Flapjack
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
           check, :redis => redis)
         return if entity_check.nil?
-        {'name'                                => check,
-         'state'                               => entity_check.state,
-         'in_unscheduled_maintenance'          => entity_check.in_unscheduled_maintenance?,
-         'in_scheduled_maintenance'            => entity_check.in_scheduled_maintenance?,
-         'last_update'                         => entity_check.last_update,
-         'last_problem_notification'           => entity_check.last_problem_notification,
-         'last_recovery_notification'          => entity_check.last_recovery_notification,
-         'last_acknowledgement_notification'   => entity_check.last_acknowledgement_notification}
+        {'name'                               => check,
+         'state'                              => entity_check.state,
+         'summary'                            => entity_check.summary,
+         'details'                            => entity_check.details,
+         'in_unscheduled_maintenance'         => entity_check.in_unscheduled_maintenance?,
+         'in_scheduled_maintenance'           => entity_check.in_scheduled_maintenance?,
+         'last_update'                        => entity_check.last_update,
+         'last_problem_notification'          => entity_check.last_problem_notification,
+         'last_recovery_notification'         => entity_check.last_recovery_notification,
+         'last_acknowledgement_notification'  => entity_check.last_acknowledgement_notification}
       end
 
       # following a callback-heavy pattern -- feels like nodejs :)

data/lib/flapjack/gateways/web/views/check.haml

@@ -134,7 +134,7 @@
             %tr
               %th Name
               %th Media
-            - @contacts.sort_by {|c| [c.last_name, c.first_name] }.each do |contact|
+            - @contacts.sort_by {|c| [c.first_name, c.last_name] }.each do |contact|
               %tr
                 %td
                   - link = "/contacts/#{contact.id}"

data/lib/flapjack/version.rb

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

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

@@ -91,6 +91,8 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     now = Time.now.to_i
 
     entity_check.should_receive(:state).and_return('OK')
+    entity_check.should_receive(:summary).and_return('not bad')
+    entity_check.should_receive(:details).and_return(nil)
     entity_check.should_receive(:in_unscheduled_maintenance?).and_return(false)
     entity_check.should_receive(:in_scheduled_maintenance?).and_return(false)
     entity_check.should_receive(:last_update).and_return(now - 30)
@@ -104,6 +106,8 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     last_response.should be_ok
     last_response.body.should == [{'name' => check,
                                    'state' => 'OK',
+                                   'summary' => 'not bad',
+                                   'details' => nil,
                                    'in_unscheduled_maintenance' => false,
                                    'in_scheduled_maintenance' => false,
                                    'last_update' => (now - 30),
@@ -129,6 +133,8 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     now = Time.now.to_i
 
     entity_check.should_receive(:state).and_return('OK')
+    entity_check.should_receive(:summary).and_return('not bad')
+    entity_check.should_receive(:details).and_return(nil)
     entity_check.should_receive(:in_unscheduled_maintenance?).and_return(false)
     entity_check.should_receive(:in_scheduled_maintenance?).and_return(false)
     entity_check.should_receive(:last_update).and_return(now - 30)
@@ -142,6 +148,8 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     last_response.should be_ok
     last_response.body.should == {'name' => nw_check,
                                   'state' => 'OK',
+                                  'summary' => 'not bad',
+                                  'details' => nil,
                                   'in_unscheduled_maintenance' => false,
                                   'in_scheduled_maintenance' => false,
                                   'last_update' => (now - 30),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -553,7 +553,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3433474727648053171
+      hash: 4072946799112620353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -562,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3433474727648053171
+      hash: 4072946799112620353
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23