flapjack 0.6.35 → 0.6.36

data/Gemfile

@@ -6,10 +6,11 @@ group :test do
   gem 'rspec'
   gem 'cucumber'
   gem 'delorean'
-  gem 'rack-test'
+  gem 'rack-test', :git => "git://github.com/brynary/rack-test.git", :ref => "8153c07"
   gem 'resque_spec'
   gem 'webmock'
   gem 'guard'
+  gem 'rb-fsevent', '~> 0.9.1'
   gem 'guard-rspec'
   gem 'guard-cucumber'
   gem 'fuubar'

data/lib/flapjack/api.rb

@@ -3,8 +3,8 @@
 # A HTTP-based API server, which provides queries to determine the status of
 # entities and the checks that are reported against them.
 #
-# There's a matching flapjack-diner gem which consumes data from this API
-# (currently at https://github.com/ali-graham/flapjack-diner -- this will change.)
+# There's a matching flapjack-diner gem at https://github.com/flpjck/flapjack-diner
+# which consumes data from this API.
 
 require 'time'
 
@@ -15,9 +15,34 @@ require 'flapjack/pikelet'
 
 require 'flapjack/api/entity_presenter'
 
+require 'flapjack/data/contact'
 require 'flapjack/data/entity'
 require 'flapjack/data/entity_check'
 
+# from https://github.com/sinatra/sinatra/issues/501
+# TODO move to its own file
+module Rack
+  class JsonParamsParser < Struct.new(:app)
+    def call(env)
+      if env['rack.input'] and not input_parsed?(env) and type_match?(env)
+        env['rack.request.form_input'] = env['rack.input']
+        data = env['rack.input'].read
+        env['rack.request.form_hash'] = data.empty?? {} : JSON.parse(data)
+      end
+      app.call(env)
+    end
+
+    def input_parsed? env
+      env['rack.request.form_input'].eql? env['rack.input']
+    end
+
+    def type_match? env
+      type = env['CONTENT_TYPE'] and
+        type.split(/\s*[;,]\s*/, 2).first.downcase == 'application/json'
+    end
+  end
+end
+
 module Flapjack
 
   class API < Sinatra::Base
@@ -27,14 +52,18 @@ module Flapjack
       rescue_exception = Proc.new { |env, exception|
         logger.error exception.message
         logger.error exception.backtrace.join("\n")
-        [503, {}, {:status => 503, :reason => exception.message}.to_json]
+        [503, {}, {:errors => [exception.message]}.to_json]
       }
 
       use Rack::FiberPool, :size => 25, :rescue_exception => rescue_exception
     end
     use Rack::MethodOverride
+    use Rack::JsonParamsParser
+
     extend Flapjack::Pikelet
 
+    set :show_exceptions, 'development'.eql?(FLAPJACK_ENV)
+
     before do
       # will only initialise the first time it's run
       Flapjack::API.bootstrap
@@ -226,8 +255,61 @@ module Flapjack
       status 204
     end
 
+    post '/entities' do
+      pass unless 'application/json'.eql?(request.content_type)
+      content_type :json
+
+      errors = []
+      ret = nil
+
+      entities = params[:entities]
+      if entities && entities.is_a?(Enumerable) && entities.any? {|e| !e['id'].nil?}
+        entities.each do |entity|
+          unless entity['id']
+            errors << "Entity not imported as it has no id: #{entity.inspect}"
+            next
+          end
+          Flapjack::Data::Entity.add(entity, :redis => @@redis)
+        end
+        ret = 200
+      else
+        ret = 403
+        errors << "No valid entities were submitted"
+      end
+      errors.empty? ? ret : [ret, {}, {:errors => [errors]}.to_json]
+    end
+
+    post '/contacts' do
+      begin
+      pass unless 'application/json'.eql?(request.content_type)
+      content_type :json
+
+      errors = []
+      ret = nil
+
+      contacts = params[:contacts]
+      if contacts && contacts.is_a?(Enumerable) && contacts.any? {|c| !c['id'].nil?}
+        Flapjack::Data::Contact.delete_all
+        contacts.each do |contact|
+          unless contact['id']
+            logger.warn "Contact not imported as it has no id: #{contact.inspect}"
+            next
+          end
+          Flapjack::Data::Contact.add(contact, :redis => @@redis)
+        end
+        ret = 200
+      else
+        ret = 403
+        errors << "No valid contacts were submitted"
+      end
+      errors.empty? ? ret : [ret, {}, {:errors => [errors]}.to_json]
+    rescue Exception => e
+      puts e.message
+    end
+    end
+
     not_found do
-      [404, {}, {:status => 404, :reason => "Not found"}.to_json]
+      [404, {}, {:errors => ["Not found"]}.to_json]
     end
 
     private

data/lib/flapjack/data/contact.rb

@@ -25,6 +25,21 @@ module Flapjack
         union
       end
 
+      def self.delete_all(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+
+        contacts = redis.keys('contact:*')
+
+        contacts.each do |c|
+          c =~ /^contact:(\d+)$/
+          id = $1
+
+          redis.del("contact:#{id}")
+          redis.del("contact_media:#{id}")
+          redis.del("contact_pagerduty:#{id}")
+        end
+      end
+
       # NB: should probably be called in the context of a Redis multi block; not doing so
       # here as calling classes may well be adding/updating multiple records in the one
       # operation
@@ -34,9 +49,9 @@ module Flapjack
         redis.del("contact:#{contact['id']}")
         redis.del("contact_media:#{contact['id']}")
         redis.del("contact_pagerduty:#{contact['id']}")
-        redis.hset("contact:#{contact['id']}", 'first_name', contact['first_name'])
-        redis.hset("contact:#{contact['id']}", 'last_name',  contact['last_name'])
-        redis.hset("contact:#{contact['id']}", 'email',      contact['email'])
+        ['first_name', 'last_name', 'email'].each do |field|
+          redis.hset("contact:#{contact['id']}", field, contact[field])
+        end
         contact['media'].each_pair {|medium, address|
           case medium
           when 'pagerduty'

data/lib/flapjack/data/entity_check.rb

@@ -60,6 +60,17 @@ module Flapjack
         @redis.exists("#{@key}:scheduled_maintenance")
       end
 
+      # return data about current maintenance (scheduled or unscheduled, as specified)
+      def current_maintenance(opts)
+        sched = opts[:scheduled] ? 'scheduled' : 'unscheduled'
+        ts = @redis.get("#{@key}:#{sched}_maintenance")
+        return unless ts
+        {:start_time => ts.to_i,
+         :duration   => @redis.zscore("#{@key}:#{sched}_maintenances", ts),
+         :summary    => @redis.get("#{@key}:#{ts}:#{sched}_maintenance:summary"),
+        }
+      end
+
       # creates, or modifies, an event object and adds it to the events list in redis
       #   'type'      => 'service',
       #   'state'     => state,
@@ -136,7 +147,28 @@ module Flapjack
         @redis.zadd("#{@key}:sorted_scheduled_maintenance_timestamps", start_time, start_time)
 
         # scheduled maintenance periods have changed, revalidate
-        update_scheduled_maintenance(:revalidate => true)
+        update_current_scheduled_maintenance(:revalidate => true)
+      end
+
+      # change the end time of a scheduled maintenance (including when one is current)
+      def update_scheduled_maintenance(start_time, patches = {})
+
+        # check if there is such a scheduled maintenance period
+        old_duration = @redis.zscore("#{@key}:scheduled_maintenances", start_time)
+        raise ArgumentError, 'no such scheduled maintenance period can be found' unless old_duration
+        raise ArgumentError, 'no handled patches have been supplied' unless patches[:end_time]
+
+        if patches[:end_time]
+          end_time = patches[:end_time]
+          raise ArgumentError unless end_time > start_time
+          old_end_time = start_time + old_duration
+          duration = end_time - start_time
+          @redis.zadd("#{@key}:scheduled_maintenances", duration, start_time)
+        end
+
+        # scheduled maintenance periods have changed, revalidate
+        update_current_scheduled_maintenance(:revalidate => true)
+
       end
 
       # delete a scheduled maintenance
@@ -148,12 +180,12 @@ module Flapjack
         @redis.zremrangebyscore("#{@key}:sorted_scheduled_maintenance_timestamps", start_time, start_time)
 
         # scheduled maintenance periods have changed, revalidate
-        update_scheduled_maintenance(:revalidate => true)
+        update_current_scheduled_maintenance(:revalidate => true)
       end
 
       # if not in scheduled maintenance, looks in scheduled maintenance list for a check to see if
       # current state should be set to scheduled maintenance, and sets it as appropriate
-      def update_scheduled_maintenance(opts = {})
+      def update_current_scheduled_maintenance(opts = {})
         if opts[:revalidate]
           @redis.del("#{@key}:scheduled_maintenance")
         else
@@ -252,7 +284,6 @@ module Flapjack
         ln = {:problem         => last_problem_notification,
               :recovery        => last_recovery_notification,
               :acknowledgement => last_acknowledgement_notification }
-        puts "***** last_notifications_of_each_type for #{@key.inspect}: #{ln.inspect}"
         ln
       end
 

data/lib/flapjack/executive.rb

@@ -161,7 +161,7 @@ module Flapjack
           result[:skip_filters] = true
         end
 
-        entity_check.update_scheduled_maintenance
+        entity_check.update_current_scheduled_maintenance
 
       # Action events represent human or automated interaction with Flapjack
       when 'action'

data/lib/flapjack/filters/acknowledgement.rb

@@ -21,7 +21,8 @@ module Flapjack
               @log.error "Filter: Acknowledgement: unknown entity for event '#{event.id}'"
             else
               ec.create_unscheduled_maintenance(:start_time => timestamp,
-                :duration => (event.duration || (4 * 60 * 60)))
+                :duration => (event.duration || (4 * 60 * 60)),
+                :summary  => event.summary)
               message = "unscheduled maintenance created for #{event.id}"
             end
           else

data/lib/flapjack/version.rb

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

data/lib/flapjack/web.rb

@@ -62,9 +62,9 @@ module Flapjack
     end
 
     get '/check' do
-      begin
+      #begin
       @entity = params[:entity]
-      @check = params[:check]
+      @check  = params[:check]
 
       entity_check = get_entity_check(@entity, @check)
       return 404 if entity_check.nil?
@@ -76,17 +76,18 @@ module Flapjack
       @check_last_change          = last_change
       @check_summary              = entity_check.summary
       @last_notifications         = entity_check.last_notifications_of_each_type
-      @in_scheduled_maintenance   = entity_check.in_scheduled_maintenance?
-      @in_unscheduled_maintenance = entity_check.in_unscheduled_maintenance?
       @scheduled_maintenances     = entity_check.maintenances(nil, nil, :scheduled => true)
       @acknowledgement_id         = entity_check.failed? ?
         entity_check.event_count_at(entity_check.last_change) : nil
 
+      @current_scheduled_maintenance   = entity_check.current_maintenance(:scheduled => true)
+      @current_unscheduled_maintenance = entity_check.current_maintenance(:scheduled => false)
+
       haml :check
-      rescue Exception => e
-        puts e.message
-        puts e.backtrace.join("\n")
-      end
+      #rescue Exception => e
+      #  puts e.message
+      #  puts e.backtrace.join("\n")
+      #end
 
     end
 
@@ -105,15 +106,13 @@ module Flapjack
       ack = entity_check.create_acknowledgement('summary' => (@summary || ''),
         'acknowledgement_id' => @acknowledgement_id, 'duration' => @duration)
 
-      # FIXME: make this a flash message on the check page and delete the acknowledge page
-      @acknowledge_success = !!ack
-      [201, haml(:acknowledge)]
+      redirect back
     end
 
     # FIXME: there is bound to be a more idiomatic / restful way of doing this
     post '/end_unscheduled_maintenance/:entity/:check' do
       @entity = params[:entity]
-      @check = params[:check]
+      @check  = params[:check]
 
       entity_check = get_entity_check(@entity, @check)
       return 404 if entity_check.nil?
@@ -130,7 +129,7 @@ module Flapjack
       duration   = ChronicDuration.parse(params[:duration])
       summary    = params[:summary]
 
-      entity_check = get_entity_check(params[:entity],  params[:check])
+      entity_check = get_entity_check(params[:entity], params[:check])
       return 404 if entity_check.nil?
 
       entity_check.create_scheduled_maintenance(:start_time => start_time,
@@ -139,6 +138,33 @@ module Flapjack
       redirect back
     end
 
+    # modify scheduled maintenance
+    patch '/scheduled_maintenances/:entity/:check' do
+
+      begin
+        puts "params: #{params.inspect}"
+
+        entity_check = get_entity_check(params[:entity], params[:check])
+        return 404 if entity_check.nil?
+
+        end_time   = Chronic.parse(params[:end_time]).to_i
+        start_time = params[:start_time].to_i
+        raise ArgumentError, "start time parsed to zero" unless start_time > 0
+
+        patches = {}
+        patches[:end_time] = end_time if end_time && (end_time > start_time)
+
+        raise ArgumentError.new("no valid data received to patch with") if patches.empty?
+
+        entity_check.update_scheduled_maintenance(start_time, patches)
+        redirect back
+
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.join("\n")
+      end
+    end
+
     # delete a scheduled maintenance
     delete '/scheduled_maintenances/:entity/:check' do
       entity_check = get_entity_check(params[:entity], params[:check])

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

@@ -49,7 +49,7 @@
       %form{:action => "/acknowledgements/#{@entity}/#{@check}", :method => "post"}
         %h2
           State: #{@check_state ? @check_state.upcase : ''}
-        - if (['warning', 'critical'].include?(@check_state) and !(@in_unscheduled_maintenance || @in_scheduled_maintenance))
+        - if (['warning', 'critical'].include?(@check_state) and !(@current_unscheduled_maintenance || @current_scheduled_maintenance))
           %input{:type => 'hidden', :name => 'acknowledgement_id', :value => "#{@acknowledgement_id}"}
           %input{:type => 'submit', :value => 'Acknowledge', :class => 'button'}
           with
@@ -59,14 +59,13 @@
           %label{:for => 'duration'}
             duration:
           %input{:type => 'text', :name => 'duration', :value => ''}
-        - if @in_unscheduled_maintenance
-          %h3 (Acknowledged)
-        - if @in_scheduled_maintenance
-          %h3 (Scheduled Maintenance)
-      - if @in_unscheduled_maintenance
+      - if @current_unscheduled_maintenance
+        %h3 (Acknowledged - #{@current_unscheduled_maintenance[:summary]})
         %form{:action => "/end_unscheduled_maintenance/#{@entity}/#{@check}", :method => "post"}
           %p
             %input{:type => 'submit', :value => 'End Unscheduled Maintenance (Unacknowledge)', :class => 'button'}
+      - if @current_scheduled_maintenance
+        %h3 (Scheduled Maintenance - #{@current_scheduled_maintenance[:summary]})
       %h3 Output: #{@check_summary}
       %table
         %tr
@@ -128,12 +127,19 @@
               %td= summary
               %td
                 - if end_time > Time.now.to_i
-                  %form{ :action => "/scheduled_maintenances/#{@entity}/#{@check}", :method => "post"}
-                    %input{:type => 'hidden', :name => '_method', :value => 'delete'}
-                    %input{:type => 'hidden', :name => 'start_time', :value => start_time}
-                    %input{:type => 'submit', :value => 'Delete', :class => 'button'}
+                  - if start_time > Time.now.to_i
+                    %form{ :action => "/scheduled_maintenances/#{@entity}/#{@check}", :method => "post"}
+                      %input{:type => 'hidden', :name => '_method', :value => 'delete'}
+                      %input{:type => 'hidden', :name => 'start_time', :value => start_time}
+                      %input{:type => 'submit', :value => 'Delete', :class => 'button'}
+                  - else
+                    %form{ :action => "/scheduled_maintenances/#{@entity}/#{@check}", :method => "post"}
+                      %input{:type => 'hidden', :name => '_method',    :value => 'patch'}
+                      %input{:type => 'hidden', :name => 'start_time', :value => start_time}
+                      %input{:type => 'hidden', :name => 'end_time',   :value => 'now'}
+                      %input{:type => 'submit', :value => 'End Now', :class => 'button'}
       - else
-        %p No scheduled maintenance
+        %p No maintenance is scheduled
       %h4 Add Scheduled Maintenace
       %form{:action => "/scheduled_maintenances/#{@entity}/#{@check}", :method => "post"}
         %fieldset

data/spec/lib/flapjack/api_spec.rb

@@ -167,4 +167,103 @@ describe 'Flapjack::API', :sinatra => true do
     last_response.body.should == result_json
   end
 
+  it "creates entities from a submitted list" do
+    entities = {'entities' =>
+      [
+       {"id" => "10001",
+        "name" => "clientx-app-01",
+        "contacts" => ["0362","0363","0364"]
+       },
+       {"id" => "10002",
+        "name" => "clientx-app-02",
+        "contacts" => ["0362"]
+       }
+      ]
+    }
+    Flapjack::Data::Entity.should_receive(:add).twice
+
+    post "/entities", entities.to_json, {'CONTENT_TYPE' => 'application/json'}
+    last_response.status.should == 200
+  end
+
+  it "does not create entities if the data is improperly formatted" do
+    Flapjack::Data::Entity.should_not_receive(:add)
+
+    post "/entities", {'entities' => ["Hello", "there"]}.to_json,
+      {'CONTENT_TYPE' => 'application/json'}
+    last_response.status.should == 403
+  end
+
+  it "does not create entities if they don't contain an id" do
+    entities = {'entities' =>
+      [
+       {"id" => "10001",
+        "name" => "clientx-app-01",
+        "contacts" => ["0362","0363","0364"]
+       },
+       {"name" => "clientx-app-02",
+        "contacts" => ["0362"]
+       }
+      ]
+    }
+    Flapjack::Data::Entity.should_receive(:add)
+
+    post "/entities", entities.to_json, {'CONTENT_TYPE' => 'application/json'}
+    last_response.status.should == 200
+  end
+
+  it "creates contacts from a submitted list" do
+    contacts = {'contacts' =>
+      [{"id" => "0362",
+        "first_name" => "John",
+        "last_name" => "Smith",
+        "email" => "johns@example.dom",
+        "media" => {"email"  => "johns@example.dom",
+                    "jabber" => "johns@conference.localhost"}},
+       {"id" => "0363",
+        "first_name" => "Jane",
+        "last_name" => "Jones",
+        "email" => "jane@example.dom",
+        "media" => {"email" => "jane@example.dom"}}
+      ]
+    }
+
+    Flapjack::Data::Contact.should_receive(:delete_all)
+    Flapjack::Data::Contact.should_receive(:add).twice
+
+    post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
+    last_response.status.should == 200
+  end
+
+  it "does not create contacts if the data is improperly formatted" do
+    Flapjack::Data::Contact.should_not_receive(:delete_all)
+    Flapjack::Data::Contact.should_not_receive(:add)
+
+    post "/contacts", {'contacts' => ["Hello", "again"]}.to_json,
+      {'CONTENT_TYPE' => 'application/json'}
+    last_response.status.should == 403
+  end
+
+  it "does not create contacts if they don't contain an id" do
+    contacts = {'contacts' =>
+      [{"id" => "0362",
+        "first_name" => "John",
+        "last_name" => "Smith",
+        "email" => "johns@example.dom",
+        "media" => {"email"  => "johns@example.dom",
+                    "jabber" => "johns@conference.localhost"}},
+       {"first_name" => "Jane",
+        "last_name" => "Jones",
+        "email" => "jane@example.dom",
+        "media" => {"email" => "jane@example.dom"}}
+      ]
+    }
+
+    Flapjack::Data::Contact.should_receive(:delete_all)
+    Flapjack::Data::Contact.should_receive(:add)
+
+    post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
+    last_response.status.should == 200
+  end
+
 end

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

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+require 'flapjack/data/contact'
+
+describe Flapjack::Data::Contact, :redis => true do
+
+  it "finds all contacts for a check on an entity"
+
+  it "deletes all contacts"
+
+  it "adds a contact"
+
+  it "returns pagerduty credentials for a contact"
+
+end

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

@@ -152,6 +152,10 @@ describe Flapjack::Data::EntityCheck, :redis => true do
 
     it "creates a scheduled maintenance period covering the current time"
 
+    it "updates a scheduled maintenance period for a future time"
+
+    it "updates a scheduled maintenance period covering the current time"
+
     it "removes a scheduled maintenance period for a future time"
 
     it "removes a scheduled maintenance period covering a current time"
@@ -395,4 +399,4 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     ec.last_recovery_notification.should == t
   end
 
-end
+end

data/spec/lib/flapjack/web_spec.rb

@@ -101,10 +101,10 @@ describe Flapjack::Web, :sinatra => true, :redis => true do
     entity_check.should_receive(:last_change).and_return(time - (3 * 60 * 60))
     entity_check.should_receive(:summary).and_return('all good')
     entity_check.should_receive(:last_notifications_of_each_type).and_return(last_notifications)
-    entity_check.should_receive(:in_scheduled_maintenance?).and_return(false)
-    entity_check.should_receive(:in_unscheduled_maintenance?).and_return(false)
     entity_check.should_receive(:maintenances).with(nil, nil, :scheduled => true).and_return([])
     entity_check.should_receive(:failed?).and_return(false)
+    entity_check.should_receive(:current_maintenance).with(:scheduled => true).and_return(false)
+    entity_check.should_receive(:current_maintenance).with(:scheduled => false).and_return(false)
 
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => @redis).and_return(entity)
@@ -142,7 +142,7 @@ describe Flapjack::Web, :sinatra => true, :redis => true do
       with(an_instance_of(Hash))
 
     post "/acknowledgements/#{entity_name_esc}/ping"
-    last_response.status.should == 201
+    last_response.status.should == 302
   end
 
   it "creates a scheduled maintenance period for an entity check" do
@@ -169,6 +169,26 @@ describe Flapjack::Web, :sinatra => true, :redis => true do
     last_response.status.should == 302
   end
 
+  # FIXME: how to support the patch http method? ... also, is putting the post data into the url the
+  # way to go here?
+  it "updates a scheduled maintenance period for an entity check" do
+    t = Time.now.to_i
+
+    start_time = t - (24 * 60 * 60)
+
+    Flapjack::Data::Entity.should_receive(:find_by_name).
+      with(entity_name, :redis => @redis).and_return(entity)
+
+    Flapjack::Data::EntityCheck.should_receive(:for_entity).
+      with(entity, 'ping', :redis => @redis).and_return(entity_check)
+
+    entity_check.should_receive(:update_scheduled_maintenance).
+      with(start_time, {:end_time => t})
+
+    patch "/scheduled_maintenances/#{entity_name_esc}/ping", {"start_time" => start_time, "end_time" => 'now'}
+    last_response.status.should == 302
+  end
+
   it "deletes a scheduled maintenance period for an entity check" do
     t = Time.now.to_i
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.35
+  version: 0.6.36
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -458,7 +458,6 @@ files:
 - lib/flapjack/utility.rb
 - lib/flapjack/version.rb
 - lib/flapjack/web.rb
-- lib/flapjack/web/views/acknowledge.haml
 - lib/flapjack/web/views/check.haml
 - lib/flapjack/web/views/index.haml
 - lib/flapjack/web/views/self_stats.haml
@@ -495,6 +494,7 @@ files:
 - spec/lib/flapjack/api/entity_presenter_spec.rb
 - spec/lib/flapjack/api_spec.rb
 - spec/lib/flapjack/coordinator_spec.rb
+- spec/lib/flapjack/data/contact_spec.rb
 - spec/lib/flapjack/data/entity_check_spec.rb
 - spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb
@@ -567,6 +567,7 @@ test_files:
 - spec/lib/flapjack/api/entity_presenter_spec.rb
 - spec/lib/flapjack/api_spec.rb
 - spec/lib/flapjack/coordinator_spec.rb
+- spec/lib/flapjack/data/contact_spec.rb
 - spec/lib/flapjack/data/entity_check_spec.rb
 - spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb

data/lib/flapjack/web/views/acknowledge.haml

@@ -1,55 +0,0 @@
-!!! 5
-%html
-  %head
-    :css
-      * { margin: 0; padding: 0; }
-      html { font-size: 62.5%; }
-      body { font-size: 16px; }
-      div#wrapper {
-        margin: 24px auto;
-        width: 1000px;
-      }
-      h1, h2, h3, h4, h5 {
-        font-family: Helvetica Neue, sans-serif;
-        margin-bottom: 12px;
-      }
-      table {
-        text-align: left;
-        width: 100%;
-      }
-      table th {
-        font-family: Helvetica Neue, sans-serif;
-        background-color: #eee;
-      }
-      table td, table th {
-        padding: 4px;
-      }
-      table td.critical {
-        background-color: #fb9a99;
-      }
-      table td.down {
-        background-color: #fb9a99;
-      }
-      table td.warning {
-        background-color: #f9bb34;
-      }
-      table td.ok {
-        background-color: #B2DF8A;
-      }
-      table td.up {
-        background-color: #B2DF8A;
-      }
-  %body
-    %div#wrapper
-      %p
-        %a(title='Dashboard' href='/') All Checks
-        |
-        %a(title='Dashboard' href='/failing') Failing Checks
-      - if @acknowledge_success
-        %h1
-          %a(href="/check?entity=#{@entity}&check=#{@check}") #{@check} on #{@entity}
-          has been acknowledged
-      - else
-        %h1
-          Failed to acknowledge
-          %a(href="/check?entity=#{@entity}&check=#{@check}") #{@check} on #{@entity}