flapjack 0.6.51 → 0.6.52

data/features/events.feature

@@ -152,3 +152,11 @@ Feature: events
     Given check 'abc' for entity 'def' is in a failure state
     When  an acknowledgement event is received for check 'abc' on entity 'def'
     Then  a notification should be generated for check 'abc' on entity 'def'
+
+  Scenario: Brief failure then OK
+    Given check 'abc' for entity 'def' is in an ok state
+    When  a failure event is received for check 'abc' on entity 'def'
+    And   10 seconds passes
+    And   an ok event is received for check 'abc' on entity 'def'
+    Then  a notification should not be generated for check 'abc' on entity 'def'
+

data/features/steps/events_steps.rb

@@ -161,4 +161,3 @@ end
 Then /^show me the notifications?$/ do
   puts @app.logger.messages.join("\n")
 end
-

data/lib/flapjack/data/contact.rb

@@ -5,6 +5,8 @@
 
 require 'set'
 
+require 'flapjack/data/entity'
+
 module Flapjack
 
   module Data
@@ -30,12 +32,14 @@ module Flapjack
       def self.delete_all(options = {})
         raise "Redis connection not set" unless redis = options[:redis]
 
-        redis.del( redis.keys("contact:*") +
-                   redis.keys("contact_media:*") +
-                   # FIXME: when we do source tagging we can properly
-                   # clean up contacts_for: keys
-                   # redis.keys('contacts_for:*') +
-                   redis.keys("contact_pagerduty:*") )
+        keys_to_delete = redis.keys("contact:*") +
+                         redis.keys("contact_media:*") +
+                         # FIXME: when we do source tagging we can properly
+                         # clean up contacts_for: keys
+                         # redis.keys('contacts_for:*') +
+                         redis.keys("contact_pagerduty:*")
+
+        redis.del(keys_to_delete) unless keys_to_delete.length == 0
       end
 
       def self.find_by_id(contact_id, options = {})

data/lib/flapjack/data/entity.rb

@@ -110,7 +110,12 @@ module Flapjack
       end
 
       def tags
-        @tags ||= load_tags
+        @tags ||= ::Set.new( @redis.keys("#{TAG_PREFIX}:*").inject([]) {|memo, entity_tag|
+          if Flapjack::Data::Tag.find(entity_tag, :redis => @redis).include?(@id.to_s)
+            memo << entity_tag.sub(/^#{TAG_PREFIX}:/, '')
+          end
+          memo
+        } )
       end
 
       def add_tags(*enum)
@@ -139,16 +144,6 @@ module Flapjack
         @logger = options[:logger]
       end
 
-      def load_tags
-        entity_tags = ::Set.new
-        tag_data = @redis.keys("#{TAG_PREFIX}:*").inject([]) do |memo, entity_tag|
-          tag = Flapjack::Data::Tag.find(entity_tag, :redis => @redis)
-          memo << entity_tag.sub(/^#{TAG_PREFIX}:/, '') if tag.include?(@id.to_s)
-          memo
-        end
-        entity_tags.merge(tag_data)
-      end
-
     end
 
   end

data/lib/flapjack/data/entity_check.rb

@@ -5,6 +5,7 @@ require 'yajl/json_gem'
 require 'flapjack/patches'
 
 require 'flapjack/data/contact'
+require 'flapjack/data/event'
 require 'flapjack/data/entity'
 
 # TODO might want to split the class methods out to a separate class, DAO pattern
@@ -153,6 +154,7 @@ module Flapjack
       end
 
       # change the end time of a scheduled maintenance (including when one is current)
+      # TODO allow to update summary as well
       def update_scheduled_maintenance(start_time, patches = {})
 
         # check if there is such a scheduled maintenance period
@@ -162,7 +164,7 @@ module Flapjack
 
         if patches[:end_time]
           end_time = patches[:end_time]
-          raise ArgumentError unless end_time > start_time
+          raise ArgumentError, "end time must be after start time" 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)
@@ -170,7 +172,6 @@ module Flapjack
 
         # scheduled maintenance periods have changed, revalidate
         update_current_scheduled_maintenance(:revalidate => true)
-
       end
 
       # delete a scheduled maintenance
@@ -404,17 +405,6 @@ module Flapjack
         }
       end
 
-      # returns an array of pagerduty credentials. If more than one contact for this entity_check
-      # has pagerduty credentials then there'll be one hash in the array for each set of
-      # credentials.
-      def pagerduty_credentials(options)
-        self.contacts.inject([]) {|ret, contact|
-          cred = contact.pagerduty_credentials
-          ret << cred if cred
-          ret
-        }
-      end
-
       # takes a check, looks up contacts that are interested in this check (or in the check's entity)
       # and returns an array of contact records
       def contacts

data/lib/flapjack/data/event.rb

@@ -6,7 +6,7 @@ module Flapjack
   module Data
     class Event
 
-      attr_accessor :previous_state
+      attr_accessor :previous_state, :previous_state_duration
 
       # Helper method for getting the next event.
       #

data/lib/flapjack/executive.rb

@@ -168,6 +168,7 @@ module Flapjack
         end
 
         event.previous_state = entity_check.state
+        event.previous_state_duration = Time.now.to_i - entity_check.last_change
         @logger.info("No previous state for event #{event.id}") if event.previous_state.nil?
 
         # If there is a state change, update record with: the time, the new state

data/lib/flapjack/filters/ok.rb

@@ -6,6 +6,9 @@ module Flapjack
   module Filters
 
     # * If the service event’s state is ok and the previous state was ok, don’t alert
+    # * If the service event's state is ok and the previous notification was a recovery, don't alert
+    # * If the service event's state is ok and the previous state was not ok and for less than 30
+    # seconds, don't alert
     # * If the service event's state is ok and there is unscheduled downtime set, end the unscheduled
     #   downtime
     class Ok
@@ -20,8 +23,23 @@ module Flapjack
             result = true
           end
 
-          # end any unscheduled downtime
           entity_check = Flapjack::Data::EntityCheck.for_event_id(event.id, :redis => @persistence)
+
+          last_notification = entity_check.last_notification
+          @log.debug("Filter: Ok: last notification: #{last_notification.inspect}")
+          if last_notification[:type] == 'recovery'
+            @log.debug("Filter: Ok: last notification was a recovery, so blocking")
+            result = true
+          end
+
+          if event.previous_state != 'ok'
+            if event.previous_state_duration < 30
+              @log.debug("Filter: Ok: previous non ok state was for less than 30 seconds, so blocking")
+              result = true
+            end
+          end
+
+          # end any unscheduled downtime
           entity_check.end_unscheduled_maintenance
         end
 

data/lib/flapjack/gateways/pagerduty.rb

@@ -48,7 +48,10 @@ module Flapjack
 
       def main
         logger.debug("pagerduty gateway - commencing main method")
-        raise "Can't connect to the pagerduty API" unless test_pagerduty_connection
+        while not test_pagerduty_connection do
+          logger.error("Can't connect to the pagerduty API, retrying after 10 seconds")
+          EM::Synchrony.sleep(10)
+        end
 
         # TODO: only clear this if there isn't another pagerduty gateway instance running
         # or better, include an instance ID in the semaphore key name
@@ -160,16 +163,25 @@ module Flapjack
         @logger.debug "found unacknowledged failing checks as follows: " + unacknowledged_failing_checks.join(', ')
 
         unacknowledged_failing_checks.each do |entity_check|
-          pagerduty_credentials = entity_check.pagerduty_credentials(:redis => @redis_timer)
+
+          # If more than one contact for this entity_check has pagerduty
+          # credentials then there'll be one hash in the array for each set of
+          # credentials.
+          ec_credentials = entity_check.contacts.inject([]) {|ret, contact|
+            cred = contact.pagerduty_credentials
+            ret << cred if cred
+            ret
+          }
+
           check = entity_check.check
 
-          if pagerduty_credentials.empty?
+          if ec_credentials.empty?
             @logger.debug("No pagerduty credentials found for #{entity_check.entity_name}:#{check}, skipping")
             next
           end
 
           # FIXME: try each set of credentials until one works (may have stale contacts turning up)
-          options = pagerduty_credentials.first.merge('check' => "#{entity_check.entity_name}:#{check}")
+          options = ec_credentials.first.merge('check' => "#{entity_check.entity_name}:#{check}")
 
           acknowledged = pagerduty_acknowledged?(options)
           if acknowledged.nil?

data/lib/flapjack/gateways/web.rb

@@ -238,6 +238,12 @@ module Flapjack
         haml :contact
       end
 
+    protected
+
+      def render_haml(file, scope)
+        Haml::Engine.new(File.read(File.dirname(__FILE__) + '/web/views/' + file)).render(scope)
+      end
+
     private
 
       def get_entity_check(entity, check)

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

@@ -1,8 +1,7 @@
 !!! 5
-- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
-- nav      = nav_haml.render
-- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
-- css      = css_haml.render
+- nav = render_haml('_nav.haml', self)
+- css = render_haml('_css.haml', self)
+- check_path_escaped = URI.escape(@entity, ' #&;/=?') << '/' << URI.escape(@check, ' #&;/=?')
 %html
   %head
     %title Flapjack - Check: #{@entity}:#{@check}
@@ -11,7 +10,7 @@
     %div#wrapper
       = nav
       %h1 #{@check} on #{@entity}
-      %form{:action => "/acknowledgements/#{@entity}/#{@check}", :method => "post"}
+      %form{:action => "/acknowledgements/#{check_path_escaped}", :method => "post"}
         %h2
           State: #{@check_state ? @check_state.upcase : ''}
         - if (['warning', 'critical'].include?(@check_state) and !(@current_unscheduled_maintenance || @current_scheduled_maintenance))
@@ -26,7 +25,7 @@
           %input{:type => 'text', :name => 'duration', :value => ''}
       - if @current_unscheduled_maintenance
         %h3 (Acknowledged - #{@current_unscheduled_maintenance[:summary]})
-        %form{:action => "/end_unscheduled_maintenance/#{@entity}/#{@check}", :method => "post"}
+        %form{:action => "/end_unscheduled_maintenance/#{check_path_escaped}", :method => "post"}
           %p
             %input{:type => 'submit', :value => 'End Unscheduled Maintenance (Unacknowledge)', :class => 'button'}
       - if @current_scheduled_maintenance
@@ -93,12 +92,12 @@
               %td
                 - if end_time > Time.now.to_i
                   - if start_time > Time.now.to_i
-                    %form{ :action => "/scheduled_maintenances/#{@entity}/#{@check}", :method => "post"}
+                    %form{ :action => "/scheduled_maintenances/#{check_path_escaped}", :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"}
+                    %form{ :action => "/scheduled_maintenances/#{check_path_escaped}", :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'}
@@ -106,7 +105,7 @@
       - else
         %p No maintenance is scheduled
       %h4 Add Scheduled Maintenance
-      %form{:action => "/scheduled_maintenances/#{@entity}/#{@check}", :method => "post"}
+      %form{:action => "/scheduled_maintenances/#{check_path_escaped}", :method => "post"}
         %fieldset
           %table
             %tr

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

@@ -1,8 +1,6 @@
 !!! 5
-- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
-- nav      = nav_haml.render
-- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
-- css      = css_haml.render
+- nav = render_haml('_nav.haml', self)
+- css = render_haml('_css.haml', self)
 %html
   %head
     %title Flapjack - Contact: #{@contact.name}
@@ -39,7 +37,7 @@
                 %p= entity.name
               %td
                 - checks.each do |check|
-                  - link = "/check?entity=#{entity.name}&check=#{check}"
+                  - link = "/check?entity=#{CGI.escape(entity.name)}&check=#{CGI.escape(check)}"
                   %p
                     %a(title='check status' href=link) #{check}
       - else

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

@@ -1,8 +1,6 @@
 !!! 5
-- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
-- nav      = nav_haml.render
-- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
-- css      = css_haml.render
+- nav = render_haml('_nav.haml', self)
+- css = render_haml('_css.haml', self)
 %html
   %head
     %title Flapjack - Contacts

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

@@ -1,8 +1,6 @@
 !!! 5
-- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
-- nav      = nav_haml.render
-- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
-- css      = css_haml.render
+- nav = render_haml('_nav.haml', self)
+- css = render_haml('_css.haml', self)
 %html
   %head
     %title Flapjack
@@ -36,7 +34,7 @@
           %tr
             %td= entity
             %td
-              - link = "/check?entity=" + entity + "&check=" + check
+              - link = "/check?entity=" + CGI.escape(entity) + "&check=" + CGI.escape(check)
               %a(title='check detail' href=link) #{check}
             %td{:class => status}
               = status.upcase
@@ -49,7 +47,3 @@
             - else
               - last_notified = 'never'
             %td= last_notified
-
-      -#%ul
-        -#- @keys.each do |key|
-          -#%li= key

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

@@ -1,8 +1,6 @@
 !!! 5
-- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
-- nav      = nav_haml.render
-- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
-- css      = css_haml.render
+- nav = render_haml('_nav.haml', self)
+- css = render_haml('_css.haml', self)
 %html
   %head
     %title Flapjack - Self Stats

data/lib/flapjack/version.rb

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

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

@@ -1,15 +1,25 @@
 require 'spec_helper'
 
 require 'flapjack/data/contact'
+require 'flapjack/data/entity_check'
 
 describe Flapjack::Data::Contact, :redis => true do
 
-  def add_contacts
+  before(:each) do
     Flapjack::Data::Contact.add({'id'         => '362',
                                  'first_name' => 'John',
                                  'last_name'  => 'Johnson',
-                                 'email'      => 'johnj@example.com' },
+                                 'email'      => 'johnj@example.com',
+                                 'media' => {
+                                    'pagerduty' => {
+                                      'service_key' => '123456789012345678901234',
+                                      'subdomain'   => 'flpjck',
+                                      'username'    => 'flapjack',
+                                      'password'    => 'very_secure'
+                                    }
+                                  }},
                                  :redis       => @redis)
+
     Flapjack::Data::Contact.add({'id'         => '363',
                                  'first_name' => 'Jane',
                                  'last_name'  => 'Janeley',
@@ -18,8 +28,6 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "returns a list of all contacts" do
-    add_contacts
-
     contacts = Flapjack::Data::Contact.all(:redis => @redis)
     contacts.should_not be_nil
     contacts.should be_an(Array)
@@ -29,18 +37,12 @@ describe Flapjack::Data::Contact, :redis => true do
   end
 
   it "finds a contact by id" do
-    add_contacts
-
     contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
     contact.should_not be_nil
     contact.name.should == "John Johnson"
   end
 
-  it "finds all contacts for a check on an entity"
-
   it "deletes all contacts" do
-    add_contacts
-
     Flapjack::Data::Contact.delete_all(:redis => @redis)
     contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
     contact.should be_nil
@@ -48,8 +50,44 @@ describe Flapjack::Data::Contact, :redis => true do
     contact.should be_nil
   end
 
-  it "returns pagerduty credentials for a contact"
+  it "returns a list of entities and their checks for a contact" do
+    entity_name = 'abc-123'
+
+    Flapjack::Data::Entity.add({'id'   => '5000',
+                                'name' => entity_name,
+                                'contacts' => ['362']},
+                                :redis => @redis)
+
+    ec = Flapjack::Data::EntityCheck.for_entity_name(entity_name, 'PING', :redis => @redis)
+    t = Time.now.to_i
+    ec.update_state('ok', :timestamp => t, :summary => 'a')
 
-  it "returns a list of entities for a contact"
+    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    eandcs = contact.entities_and_checks
+    eandcs.should_not be_nil
+    eandcs.should be_an(Array)
+    eandcs.should have(1).entity_and_checks
+
+    eandc = eandcs.first
+    eandc.should be_a(Hash)
+
+    entity = eandc[:entity]
+    entity.name.should == entity_name
+    checks = eandc[:checks]
+    checks.should be_a(Set)
+    checks.should have(1).check
+    checks.should include('PING')
+  end
+
+  it "returns pagerduty credentials for a contact" do
+    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    credentials = contact.pagerduty_credentials
+    credentials.should_not be_nil
+    credentials.should be_a(Hash)
+    credentials.should == {'service_key' => '123456789012345678901234',
+                           'subdomain'   => 'flpjck',
+                           'username'    => 'flapjack',
+                           'password'    => 'very_secure'}
+  end
 
 end

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

@@ -13,8 +13,15 @@ describe Flapjack::Data::EntityCheck, :redis => true do
   let(:half_an_hour) { 30 * 60 }
 
   before(:each) do
+    Flapjack::Data::Contact.add({'id'         => '362',
+                                 'first_name' => 'John',
+                                 'last_name'  => 'Johnson',
+                                 'email'      => 'johnj@example.com' },
+                                 :redis       => @redis)
+
     Flapjack::Data::Entity.add({'id'   => '5000',
-                                'name' => name},
+                                'name' => name,
+                                'contacts' => ['362']},
                                :redis => @redis)
   end
 
@@ -106,21 +113,21 @@ describe Flapjack::Data::EntityCheck, :redis => true do
       timestamp.should_not be_nil
       timestamp.should == t.to_s
 
-      umps = @redis.zrange("#{name}:#{check}:unscheduled_maintenances", 0, -1, :with_scores => true)
+      umps = ec.maintenances(nil, nil, :scheduled => false)
       umps.should_not be_nil
       umps.should be_an(Array)
       umps.should have(1).unscheduled_maintenance_period
-      umps[0].should be_an(Array)
+      umps[0].should be_a(Hash)
 
-      start_time = umps[0][0]
+      start_time = umps[0][:start_time]
       start_time.should_not be_nil
-      start_time.should be_a(String)
-      start_time.should == t.to_s
+      start_time.should be_an(Integer)
+      start_time.should == t
 
-      score = umps[0][1]
-      score.should_not be_nil
-      score.should be_a(Float)
-      score.should == half_an_hour
+      duration = umps[0][:duration]
+      duration.should_not be_nil
+      duration.should be_a(Float)
+      duration.should == half_an_hour
 
       summary = @redis.get("#{name}:#{check}:#{t}:unscheduled_maintenance:summary")
       summary.should_not be_nil
@@ -133,32 +140,167 @@ describe Flapjack::Data::EntityCheck, :redis => true do
       ec.create_scheduled_maintenance(:start_time => t + (60 * 60),
         :duration => half_an_hour, :summary => "30 minutes")
 
-      smps = @redis.zrange("#{name}:#{check}:scheduled_maintenances", 0, -1, :with_scores => true)
+      smps = ec.maintenances(nil, nil, :scheduled => true)
+      smps.should_not be_nil
+      smps.should be_an(Array)
+      smps.should have(1).scheduled_maintenance_period
+      smps[0].should be_a(Hash)
+
+      start_time = smps[0][:start_time]
+      start_time.should_not be_nil
+      start_time.should be_an(Integer)
+      start_time.should == (t + (60 * 60))
+
+      duration = smps[0][:duration]
+      duration.should_not be_nil
+      duration.should be_a(Float)
+      duration.should == half_an_hour
+    end
+
+    # TODO this should probably enforce that it starts in the future
+    it "creates a scheduled maintenance period covering the current time" do
+      t = Time.now.to_i
+      ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+      ec.create_scheduled_maintenance(:start_time => t - (60 * 60),
+        :duration => 2 * (60 * 60), :summary => "2 hours")
+
+      smps = ec.maintenances(nil, nil, :scheduled => true)
+      smps.should_not be_nil
+      smps.should be_an(Array)
+      smps.should have(1).scheduled_maintenance_period
+      smps[0].should be_a(Hash)
+
+      start_time = smps[0][:start_time]
+      start_time.should_not be_nil
+      start_time.should be_an(Integer)
+      start_time.should == (t - (60 * 60))
+
+      duration = smps[0][:duration]
+      duration.should_not be_nil
+      duration.should be_a(Float)
+      duration.should == 2 * (60 * 60)
+    end
+
+    it "updates a scheduled maintenance period for a future time" do
+      t = Time.now.to_i
+      ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+      ec.create_scheduled_maintenance(:start_time => t + (60 * 60),
+        :duration => 2 * (60 * 60), :summary => "2 hours")
+
+      ec.update_scheduled_maintenance(t + (60 * 60), :end_time => t + (4 * (60 * 60)))
+      smps = ec.maintenances(nil, nil, :scheduled => true)
+      smps.should_not be_nil
+      smps.should be_an(Array)
+      smps.should have(1).scheduled_maintenance_period
+      smps[0].should be_a(Hash)
+
+      start_time = smps[0][:start_time]
+      start_time.should_not be_nil
+      start_time.should be_an(Integer)
+      start_time.should == (t + (60 * 60))
+
+      duration = smps[0][:duration]
+      duration.should_not be_nil
+      duration.should be_a(Float)
+      duration.should == 3 * (60 * 60)
+    end
+
+    # TODO this should probably enforce that it starts in the future
+    it "updates a scheduled maintenance period covering the current time", :time => true do
+      t = Time.now.to_i
+      ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+      ec.create_scheduled_maintenance(:start_time => t + (60 * 60),
+        :duration => 2 * (60 * 60), :summary => "2 hours")
+
+      Delorean.time_travel_to( Time.at(t + (90 * 60)) )
+
+      ec.update_scheduled_maintenance(t + (60 * 60), :end_time => t + (4 * (60 * 60)))
+      smps = ec.maintenances(nil, nil, :scheduled => true)
+      smps.should_not be_nil
+      smps.should be_an(Array)
+      smps.should have(1).scheduled_maintenance_period
+      smps[0].should be_a(Hash)
+
+      start_time = smps[0][:start_time]
+      start_time.should_not be_nil
+      start_time.should be_an(Integer)
+      start_time.should == (t + (60 * 60))
+
+      duration = smps[0][:duration]
+      duration.should_not be_nil
+      duration.should be_a(Float)
+      duration.should == 3 * (60 * 60)
+    end
+
+    it "fails to update a scheduled maintenance period when not found" do
+      t = Time.now.to_i
+      ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+      lambda {
+        ec.update_scheduled_maintenance(t + (60 * 60), :end_time => t + (2 * (60 * 60)))
+      }.should raise_error(ArgumentError)
+
+      smps = ec.maintenances(nil, nil, :scheduled => true)
+      smps.should_not be_nil
+      smps.should be_an(Array)
+      smps.should be_empty
+    end
+
+    it "fails to update a scheduled maintenance period with invalid end time" do
+      t = Time.now.to_i
+      ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+      ec.create_scheduled_maintenance(:start_time => t + (60 * 60),
+        :duration => 2 * (60 * 60), :summary => "2 hours")
+
+      lambda {
+        ec.update_scheduled_maintenance(t + (60 * 60), :end_time => t - (4 * (60 * 60)))
+      }.should raise_error(ArgumentError)
+      smps = ec.maintenances(nil, nil, :scheduled => true)
       smps.should_not be_nil
       smps.should be_an(Array)
       smps.should have(1).scheduled_maintenance_period
-      smps[0].should be_an(Array)
+      smps[0].should be_a(Hash)
 
-      start_time = smps[0][0]
+      start_time = smps[0][:start_time]
       start_time.should_not be_nil
-      start_time.should be_a(String)
-      start_time.should == (t + (60 * 60)).to_s
+      start_time.should be_an(Integer)
+      start_time.should == (t + (60 * 60))
 
-      score = smps[0][1]
-      score.should_not be_nil
-      score.should be_a(Float)
-      score.should == half_an_hour
+      duration = smps[0][:duration]
+      duration.should_not be_nil
+      duration.should be_a(Float)
+      duration.should == 2 * (60 * 60)
     end
 
-    it "creates a scheduled maintenance period covering the current time"
+    it "removes a scheduled maintenance period for a future time" do
+      t = Time.now.to_i
+      ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+      ec.create_scheduled_maintenance(:start_time => t + (60 * 60),
+        :duration => 2 * (60 * 60), :summary => "2 hours")
+
+      ec.delete_scheduled_maintenance(:start_time => t + (60 * 60))
 
-    it "updates a scheduled maintenance period for a future time"
+      smps = ec.maintenances(nil, nil, :scheduled => true)
+      smps.should_not be_nil
+      smps.should be_an(Array)
+      smps.should be_empty
+    end
+
+    # TODO this should probably enforce that it starts in the future
+    it "removes a scheduled maintenance period covering a current time", :time => true do
+      t = Time.now.to_i
+      ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+      ec.create_scheduled_maintenance(:start_time => t + (60 * 60),
+        :duration => 2 * (60 * 60), :summary => "2 hours")
 
-    it "updates a scheduled maintenance period covering the current time"
+      Delorean.time_travel_to( Time.at(t + (90 * 60)) )
 
-    it "removes a scheduled maintenance period for a future time"
+      ec.delete_scheduled_maintenance(:start_time => t + (60 * 60))
 
-    it "removes a scheduled maintenance period covering a current time"
+      smps = ec.maintenances(nil, nil, :scheduled => true)
+      smps.should_not be_nil
+      smps.should be_an(Array)
+      smps.should be_empty
+    end
 
     it "returns a list of scheduled maintenance periods" do
       t = Time.now.to_i
@@ -210,8 +352,6 @@ describe Flapjack::Data::EntityCheck, :redis => true do
                         :summary    => "second"}
     end
 
-    it "updates scheduled maintenance periods"
-
   end
 
   it "creates an acknowledgement" do
@@ -300,20 +440,20 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
 
     t = Time.now.to_i
-    # ec.update_state('ok', :timestamp => time_before(t, 5), :summary => 'a')
-    # ec.update_state('critical', :timestamp => time_before(t, 4), :summary => 'b')
-    # ec.update_state('ok', :timestamp => time_before(t, 3), :summary => 'c')
-    # ec.update_state('critical', :timestamp => time_before(t, 2), :summary => 'd')
-    # ec.update_state('ok', :timestamp => time_before(t, 1), :summary => 'e')
-
-    # states = ec.historical_states(time_before(t, 4), t)
-    # states.should_not be_nil
-    # states.should be_an(Array)
-    # states.should have(4).data_hashes
-    # states[0][:summary].should == 'b'
-    # states[1][:summary].should == 'c'
-    # states[2][:summary].should == 'd'
-    # states[3][:summary].should == 'e'
+    ec.update_state('ok', :timestamp => time_before(t, 5), :summary => 'a')
+    ec.update_state('critical', :timestamp => time_before(t, 4), :summary => 'b')
+    ec.update_state('ok', :timestamp => time_before(t, 3), :summary => 'c')
+    ec.update_state('critical', :timestamp => time_before(t, 2), :summary => 'd')
+    ec.update_state('ok', :timestamp => time_before(t, 1), :summary => 'e')
+
+    states = ec.historical_states(time_before(t, 4), t)
+    states.should_not be_nil
+    states.should be_an(Array)
+    states.should have(4).data_hashes
+    states[0][:summary].should == 'b'
+    states[1][:summary].should == 'c'
+    states[2][:summary].should == 'd'
+    states[3][:summary].should == 'e'
   end
 
   it "returns a list of historical scheduled maintenances for a time range" do
@@ -360,7 +500,18 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     ec.should_not be_failed
   end
 
-  it "returns a status summary"
+  it "returns a status summary" do
+    ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+
+    t = Time.now.to_i
+    ec.update_state('ok', :timestamp => time_before(t, 5), :summary => 'a')
+    ec.update_state('critical', :timestamp => time_before(t, 4), :summary => 'b')
+    ec.update_state('ok', :timestamp => time_before(t, 3), :summary => 'c')
+    ec.update_state('critical', :timestamp => time_before(t, 2), :summary => 'd')
+
+    summary = ec.summary
+    summary.should == 'd'
+  end
 
   it "returns timestamps for its last notifications" do
     t = Time.now.to_i
@@ -374,4 +525,12 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     ec.last_recovery_notification.should == t
   end
 
+  it "finds all related contacts" do
+    ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
+    contacts = ec.contacts
+    contacts.should_not be_nil
+    contacts.should be_an(Array)
+    contacts.should have(1).contact
+    contacts.first.name.should == 'John Johnson'
+  end
 end

data/spec/lib/flapjack/data/tag_spec.rb

@@ -3,10 +3,34 @@ require 'flapjack/data/entity'
 
 describe Flapjack::Data::Tag, :redis => true do
 
-  it "adds references to tags"
+  it "adds references to tags" do
+    tags = Flapjack::Data::Tag.create('special', ['apple', 'button', 'carbon'], :redis => @redis)
 
-  it "deletes references from tags"
+    tags.should include('carbon')
+    tags.should_not include('chocolate')
 
-  it "lists references contained in a tag"
+    tags.add('chocolate')
+    tags.should include('chocolate')
+  end
+
+  it "deletes references from tags" do
+    tags = Flapjack::Data::Tag.create('special', ['apple', 'button', 'carbon'], :redis => @redis)
+
+    tags.should include('apple')
+    tags.should include('button')
+
+    tags.delete('button')
+    tags.should include('apple')
+    tags.should_not include('button')
+  end
+
+  it "lists references contained in a tag" do
+    t1 = Flapjack::Data::Tag.create('special', ['apple', 'button', 'carbon'], :redis => @redis)
+
+    t2 = Flapjack::Data::Tag.find('special', :redis => @redis)
+    t2.should include('apple')
+    t2.should include('carbon')
+    t2.should_not include('chocolate')
+  end
 
 end

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

@@ -61,7 +61,24 @@ describe 'Flapjack::Gateways::API', :sinatra => true do
     last_response.status.should == 204
   end
 
-  it "returns a list of scheduled maintenance periods within a time window for an entity"
+  it "returns a list of scheduled maintenance periods within a time window for an entity" do
+    start  = Time.parse('1 Jan 2012')
+    finish = Time.parse('6 Jan 2012')
+
+    result = mock('result')
+    result_json = %q{"result"}
+    result.should_receive(:to_json).and_return(result_json)
+    entity_presenter.should_receive(:scheduled_maintenance).with(start.to_i, finish.to_i).and_return(result)
+    Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
+      with(entity, :redis => redis).and_return(entity_presenter)
+    Flapjack::Data::Entity.should_receive(:find_by_name).
+      with(entity_name, :redis => redis).and_return(entity)
+
+    get "/scheduled_maintenances/#{entity_name_esc}?" +
+      "start_time=#{CGI.escape(start.iso8601)}&end_time=#{CGI.escape(finish.iso8601)}"
+    last_response.should be_ok
+    last_response.body.should == result_json
+  end
 
   it "returns a list of scheduled maintenance periods for a check on an entity" do
     result = mock('result')
@@ -112,8 +129,26 @@ describe 'Flapjack::Gateways::API', :sinatra => true do
     last_response.body.should == result_json
   end
 
+  it "returns a list of unscheduled maintenance periods within a time window for a check an entity" do
+    start    = Time.parse('1 Jan 2012')
+    finish   = Time.parse('6 Jan 2012')
 
-  it "returns a list of unscheduled maintenance periods within a time window for a check an entity"
+    result = mock('result')
+    result_json = %q{"result"}
+    result.should_receive(:to_json).and_return(result_json)
+    entity_check_presenter.should_receive(:unscheduled_maintenance).with(start.to_i, finish.to_i).and_return(result)
+    Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
+      with(entity_check).and_return(entity_check_presenter)
+    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, check, :redis => redis).and_return(entity_check)
+
+    get "/unscheduled_maintenances/#{entity_name_esc}/#{check}" +
+      "?start_time=#{CGI.escape(start.iso8601)}&end_time=#{CGI.escape(finish.iso8601)}"
+    last_response.should be_ok
+    last_response.body.should == result_json
+  end
 
   it "returns a list of outages for an entity" do
     result = mock('result')

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

@@ -93,14 +93,17 @@ describe Flapjack::Gateways::Pagerduty, :redis => true do
     Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
 
-    entity_check = mock('entity_check')
-    entity_check.should_receive(:check).and_return('PING')
-    entity_check.should_receive(:pagerduty_credentials).and_return([{
+    contact = mock('contact')
+    contact.should_receive(:pagerduty_credentials).and_return({
       'service_key' => '12345678',
       'subdomain"'  => 'flpjck',
       'username'    => 'flapjack',
       'password'    => 'password123'
-    }])
+    })
+
+    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')
 

data/spec/lib/flapjack/gateways/web/views/check.haml_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'web/views/check.haml', :haml_view => true do
+
+  it "should escape unsafe check characters in URIs" do
+    @entity = 'abc-xyz-01'
+    @check  = 'Disk / Utilisation'
+    @last_notifications = {}
+
+    page = render_haml('check.haml', self)
+    page.should match(%r{/abc-xyz-01/Disk%20%2F%20Utilisation})
+  end
+
+end

data/spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'web/views/contact.haml', :haml_view => true do
+
+  it "should escape unsafe check characters in URI parameters" do
+    @contact = mock('contact')
+    @contact.should_receive(:media)
+    @contact.should_receive(:name).twice.and_return('Aeschylus')
+
+    entity = mock('entity')
+    entity.should_receive(:name).twice.and_return('abc-xyz-01')
+
+    checks = ['Disk / Utilisation']
+
+    @entities_and_checks = [{:entity => entity, :checks => checks}]
+
+    page = render_haml('contact.haml', self)
+    page.should match(%r{\?entity=abc-xyz-01&check=Disk\+%2F\+Utilisation})
+  end
+
+end

data/spec/lib/flapjack/gateways/web/views/index.haml_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe 'web/views/index.haml', :haml_view => true do
+
+  it "should escape unsafe check characters in URI parameters" do
+    @states = [['abc-xyz-01', 'Disk / Utilisation', '-', '-', '-', false, false, nil, nil]]
+
+    page = render_haml('index.haml', self)
+    page.should match(%r{\?entity=abc-xyz-01&check=Disk\+%2F\+Utilisation})
+  end
+
+end

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

@@ -216,8 +216,17 @@ describe Flapjack::Gateways::Web, :sinatra => true, :redis => true do
     last_response.should be_ok
   end
 
-  it "shows details of an individual contact found by email"
+  it "shows details of an individual contact found by id" do
+    contact = mock('contact')
+    contact.should_receive(:name).twice.and_return("Smithson Smith")
+    contact.should_receive(:media).exactly(3).times.and_return({})
+    contact.should_receive(:entities_and_checks).and_return([])
 
-  it "shows details of an individual contact found by id"
+    Flapjack::Data::Contact.should_receive(:find_by_id).
+      with('0362', :redis => @redis).and_return(contact)
+
+    get "/contacts/0362"
+    last_response.should be_ok
+  end
 
 end

data/spec/spec_helper.rb

@@ -45,5 +45,11 @@ RSpec.configure do |config|
     @redis.quit
   end
 
+  config.after(:each, :time => true) do
+    Delorean.back_to_the_present
+  end
+
+  config.include HamlViewHelper, :haml_view => true
+
   config.include Rack::Test::Methods, :sinatra => true
 end

data/spec/support/haml_view_helper.rb

@@ -0,0 +1,15 @@
+require 'haml'
+require 'flapjack/utility'
+
+module HamlViewHelper
+
+  TEMPLATE_PATH = File.dirname(__FILE__) +
+      '/../../lib/flapjack/gateways/web/views/'
+
+  include Flapjack::Utility
+
+  def render_haml(file, scope)
+    Haml::Engine.new(File.read(TEMPLATE_PATH + file)).render(scope)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.51
+  version: 0.6.52
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -432,11 +432,15 @@ files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet.spec.rb
+- spec/lib/flapjack/gateways/web/views/check.haml_spec.rb
+- spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb
+- spec/lib/flapjack/gateways/web/views/index.haml_spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb
 - spec/spec_helper.rb
+- spec/support/haml_view_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb
 - tasks/events.rake
@@ -512,10 +516,14 @@ test_files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet.spec.rb
+- spec/lib/flapjack/gateways/web/views/check.haml_spec.rb
+- spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb
+- spec/lib/flapjack/gateways/web/views/index.haml_spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
 - spec/lib/flapjack/utility_spec.rb
 - spec/spec_helper.rb
+- spec/support/haml_view_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb