flapjack 2.0.0b1 → 2.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f80bd12fd052bc57f9cbb1bc686cd4486c13048
-  data.tar.gz: 4dfd2c65ce37dc1c1029eba4163c918eb301fc46
+  metadata.gz: 0ea7398f861ed32dc81a2ebc3bf46e34a69b2457
+  data.tar.gz: 25e571baec4fbcd2cc7404eb49f254bf6b8ab70c
 SHA512:
-  metadata.gz: 77963f6d58d2068d582dc361cc9c9bc1d0533f28cf63a81e3c6ebcde341277cf5dd6d26f74f70a4045f492f0069a02e079009f77f867c003bf1d98098d07a5fb
-  data.tar.gz: cc105efea7c53645be8fe33b38868bcc9d9a051e1d0498fce0208621a0187ccef2bb0aaa38674e6d415d993bfdc8336c9370cfe3bea99c096d7587e877ca73cd
+  metadata.gz: ab8b5bba15913b850cf817da2478b17e9bee841d17c6660f6c7cbd409b266b05e39391e05019e4d854c2034d7e297e4d6d286d263216b47cba4b4af7ac5d9d57
+  data.tar.gz: 745eb50a67ba61cbfca7a8315564d4abbf80909daa015f11f7fa2ce1d12189cdc3edb314286f5ba0e1ddd1148b05fdb3d37b42174e872c770bb9176c6eb1c3b4

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/.travis.yml

@@ -1,10 +1,11 @@
 sudo: false
 language: ruby
 rvm:
-- '2.0'
-- '2.1'
-- '2.2'
-- 'jruby-9.0.0.0'
+- '2.0.0-p648'
+- '2.1.8'
+- '2.2.4'
+- '2.3.0'
+- 'jruby-9.0.4.0'
 jdk: oraclejdk8
 script: bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features && cd src/flapjack && go test -v
 env: GOPATH=$TRAVIS_BUILD_DIR
@@ -16,7 +17,6 @@ before_script:
 - mkdir -p ./log
 before_install:
 - git submodule update --init --recursive
-- gem install bundler
 install:
 - go get github.com/garyburd/redigo/redis
 - go get github.com/go-martini/martini

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 2.0.0rc1 - 2016-01-08
+- Feature: First release candidate for v2.0.
+- Feature: Added configurable recovery delay (@necula-01 and @ali-graham)
+
 # 2.0.0b1 - 2015-10-12
 - Feature: First beta release for v2.0.
 

data/features/events.feature

@@ -31,12 +31,31 @@ Feature: events
 
   @time
   Scenario: Check critical to critical after 10 seconds, with an initial delay of 5 seconds
-    Given the check is in an ok state
-    When  a critical event with an initial failure delay of 5 seconds is received
+    Given event initial failure delay is 5 seconds
+    And   the check is in an ok state
+    When  a critical event is received
     And   10 seconds passes
-    And   a critical event with an initial failure delay of 5 seconds is received
+    And   a critical event is received
     Then  1 notification should have been generated
 
+  @time
+  Scenario: Check recovery with recovery delay
+    Given event initial recovery delay is 30 seconds
+    And   the check is in an ok state
+    When  a critical event is received
+    And   1 minute passes
+    And   a critical event is received
+    Then  1 notification should have been generated
+    When  10 seconds passes
+    And   an ok event is received
+    Then  1 notification should have been generated
+    When  10 seconds passes
+    And   an ok event is received
+    Then  1 notification should have been generated
+    When  25 seconds passes
+    And   an ok event is received
+    Then  2 notifications should have been generated
+
   @time
   Scenario: Check ok to warning for 1 minute
     Given the check is in an ok state
@@ -55,10 +74,11 @@ Feature: events
 
   @time
   Scenario: Check ok to critical for 1 minute, with an initial delay of 2 minutes
+    Given event initial failure delay is 120 seconds
     And   the check is in an ok state
-    When  a critical event with an initial failure delay of 120 seconds is received
+    When  a critical event is received
     And   1 minute passes
-    And   a critical event with an initial failure delay of 120 seconds is received
+    And   a critical event is received
     Then  no notifications should have been generated
 
   @time
@@ -88,13 +108,14 @@ Feature: events
 
   @time
   Scenario: Check critical and alerted to critical for 40 seconds, with a repeat delay of 20 seconds
-    Given the check is in an ok state
-    When  a critical event with a repeat failure delay of 20 seconds is received
+    Given event repeat failure delay is 20 seconds
+    And the check is in an ok state
+    When  a critical event is received
     And   1 minute passes
-    And   a critical event with a repeat failure delay of 20 seconds is received
+    And   a critical event is received
     Then  1 notification should have been generated
     When  40 seconds passes
-    And   a critical event with a repeat failure delay of 20 seconds is received
+    And   a critical event is received
     Then  2 notifications should have been generated
 
   @time
@@ -110,13 +131,14 @@ Feature: events
 
   @time
   Scenario: Check critical and alerted to critical for 6 minutes, with a repeat delay of 10 minutes
-    Given the check is in an ok state
-    When  a critical event with a repeat failure delay of 600 seconds is received
+    Given event repeat failure delay is 600 seconds
+    And the check is in an ok state
+    When  a critical event is received
     And   1 minute passes
-    And   a critical event with a repeat failure delay of 600 seconds is received
+    And   a critical event is received
     Then  1 notification should have been generated
     When  6 minutes passes
-    And   a critical event with a repeat failure delay of 600 seconds is received
+    And   a critical event is received
     Then  1 notification should have been generated
 
   @time
@@ -199,6 +221,8 @@ Feature: events
     Then  2 notifications should have been generated
     When  6 minutes passes
     And   a critical event is received
+    And   45 seconds passes
+    And   a critical event is received
     Then  3 notifications should have been generated
     When  6 minutes passes
     And   a critical event is received
@@ -220,6 +244,8 @@ Feature: events
     Then  2 notifications should have been generated
     When  10 seconds passes
     And   a critical event is received
+    And   45 seconds passes
+    And   a critical event is received
     Then  3 notifications should have been generated
     When  50 seconds passes
     And   a critical event is received
@@ -329,6 +355,8 @@ Feature: events
     When  10 seconds passes
     # 120 seconds
     And   a critical event is received
+    And   45 seconds passes
+    And   a critical event is received
     Then  3 notifications should have been generated
     When  10 seconds passes
     And   a critical event is received
@@ -438,6 +466,8 @@ Scenario: a lot of quick ok -> warning -> ok -> warning
     Then  2 notifications should have been generated
     When  10 seconds passes
     And   a warning event is received
+    And   45 seconds passes
+    And   a warning event is received
     Then  3 notifications should have been generated
     When  10 seconds passes
     And   a warning event is received
@@ -445,3 +475,47 @@ Scenario: a lot of quick ok -> warning -> ok -> warning
     When  10 seconds passes
     And   an ok event is received
     Then  4 notifications should have been generated
+
+  @time
+  Scenario: a transient recovery
+    Given event initial recovery delay is 30 seconds
+    Given the check is in a critical state
+    When  35 seconds passes
+    # 'event 1: critical'
+    And   a critical event is received
+    Then  1 notification should have been generated
+
+    When  5 seconds passes
+    # 'event 2: ok - no event, before initial_recovery_delay'
+    And   an ok event is received
+    Then  1 notification should have been generated
+
+    When  5 seconds passes
+    # 'event 3: ok - no event, still before initial_recovery_delay'
+    And   an ok event is received
+    Then  1 notification should have been generated
+
+    When 10 seconds passes
+    # 'event 4: critical, no event because we were in the initial_failure_delay'
+    And  a critical event is received
+    Then  1 notification should have been generated
+
+    When 30 seconds passes
+    # 'event 5: critical, no event because we are in the repeat_failure_delay'
+    And  a critical event is received
+    Then  1 notification should have been generated
+
+    When 10 seconds passes
+    # 'event 6: ok - no event, before initial_recovery_delay'
+    And   an ok event is received
+    Then  1 notification should have been generated
+
+    When 60 seconds passes
+    # 'event 7: ok - send event, after initial_recovery_delay'
+    And   an ok event is received
+    Then  2 notifications should have been generated
+
+    When 60 seconds passes
+    # 'event 8: ok - no event, we have already sent the recovery'
+    And   an ok event is received
+    Then  2 notifications should have been generated

data/features/steps/events_steps.rb

@@ -64,7 +64,7 @@ def set_state(entity_name, check_name, condition, last_update = Time.now)
   check.states << state
 end
 
-def submit_event(condition, entity_name, check_name, opts = {})
+def submit_event(condition, entity_name, check_name)
   err_rate = case condition
   when 'ok'
     '0'
@@ -80,9 +80,10 @@ def submit_event(condition, entity_name, check_name, opts = {})
     'entity'  => entity_name,
     'check'   => check_name,
   }
-  ['initial', 'repeat'].each do |delay_type|
-    delay_key = "#{delay_type}_failure_delay".to_sym
-    event.update(delay_key => opts[delay_key]) unless opts[delay_key].nil?
+  ['initial_failure', 'repeat_failure', 'initial_recovery'].each do |delay_type|
+    delay = instance_variable_get("@event_#{delay_type}_delay")
+    next if delay.nil? || delay < 0
+    event.update("#{delay_type}_delay".to_sym => delay)
   end
   Flapjack.redis.rpush('events', Flapjack.dump_json(event))
 end
@@ -151,18 +152,15 @@ Given /^(?:the check|check '([\w\.\-]+)' for entity '([\w\.\-]+)') is in unsched
   set_unscheduled_maintenance(entity_name, check_name, 60*60*2)
 end
 
-When /^an? (ok|failure|critical|warning|unknown) event(?: with an? (initial|repeat) failure delay of (\d+) seconds)? is received(?: for check '([\w\.\-]+)' on entity '([\w\.\-]+)')?$/ do |condition, init_or_repeat, failure_delay, check_name, entity_name|
+# Set the delays for next events
+Given /^event (initial failure|repeat failure|initial recovery) delay is (\d+) seconds$/ do |delay_type, delay|
+  instance_variable_set("@event_#{delay_type.sub(/ /, '_')}_delay", delay.to_i)
+end
+
+When /^an? (ok|failure|critical|warning|unknown) event is received(?: for check '([\w\.\-]+)' on entity '([\w\.\-]+)')?$/ do |condition, check_name, entity_name|
   check_name  ||= @check_name
   entity_name ||= @entity_name
-  opts = case init_or_repeat
-  when 'initial'
-    {:initial_failure_delay => failure_delay}
-  when 'repeat'
-    {:repeat_failure_delay => failure_delay}
-  else
-    {}
-  end
-  submit_event(condition, entity_name, check_name, opts)
+  submit_event(condition, entity_name, check_name)
   drain_events
 end
 

data/lib/flapjack.rb

@@ -16,6 +16,10 @@ module Flapjack
   DEFAULT_INITIAL_FAILURE_DELAY = 30
   DEFAULT_REPEAT_FAILURE_DELAY  = 60
 
+  # defaulting to 0 for backwards compatibility; can be overridden in config,
+  # or per check / event
+  DEFAULT_INITIAL_RECOVERY_DELAY = 0
+
   def self.load_json(data)
     ActiveSupport::JSON.decode(data)
   end

data/lib/flapjack/data/check.rb

@@ -31,15 +31,16 @@ module Flapjack
       include Flapjack::Data::Extensions::Associations
       include Flapjack::Data::Extensions::ShortName
 
-      define_attributes :name                  => :string,
-                        :enabled               => :boolean,
-                        :ack_hash              => :string,
-                        :initial_failure_delay => :integer,
-                        :repeat_failure_delay  => :integer,
-                        :notification_count    => :integer,
-                        :condition             => :string,
-                        :failing               => :boolean,
-                        :alertable             => :boolean
+      define_attributes :name                   => :string,
+                        :enabled                => :boolean,
+                        :initial_failure_delay  => :integer,
+                        :repeat_failure_delay   => :integer,
+                        :initial_recovery_delay => :integer,
+                        :ack_hash               => :string,
+                        :notification_count     => :integer,
+                        :condition              => :string,
+                        :failing                => :boolean,
+                        :alertable              => :boolean
 
       index_by :enabled, :failing, :alertable
       unique_index_by :name, :ack_hash
@@ -204,6 +205,9 @@ module Flapjack
       validates :repeat_failure_delay, :allow_nil => true,
         :numericality => {:greater_than_or_equal_to => 0, :only_integer => true}
 
+      validates :initial_recovery_delay, :allow_nil => true,
+        :numericality => {:greater_than_or_equal_to => 0, :only_integer => true}
+
       before_validation :create_ack_hash
       validates :ack_hash, :presence => true
 
@@ -213,7 +217,8 @@ module Flapjack
 
       swagger_schema :Check do
         key :required, [:id, :type, :name, :enabled, :initial_failure_delay,
-          :repeat_failure_delay, :failing]
+          :repeat_failure_delay, :initial_recovery_delay, :failing, :condition,
+          :ack_hash]
         property :id do
           key :type, :string
           key :format, :uuid
@@ -235,6 +240,9 @@ module Flapjack
         property :repeat_failure_delay do
           key :type, :integer
         end
+        property :initial_recovery_delay do
+          key :type, :integer
+        end
         property :failing do
           key :type, :boolean
           key :enum, [true, false]
@@ -286,8 +294,7 @@ module Flapjack
       end
 
       swagger_schema :CheckCreate do
-        key :required, [:type, :name, :enabled, :initial_failure_delay,
-          :repeat_failure_delay]
+        key :required, [:type, :name, :enabled]
         property :id do
           key :type, :string
           key :format, :uuid
@@ -309,6 +316,9 @@ module Flapjack
         property :repeat_failure_delay do
           key :type, :integer
         end
+        property :initial_recovery_delay do
+          key :type, :integer
+        end
         property :relationships do
           key :"$ref", :CheckCreateLinks
         end
@@ -343,6 +353,9 @@ module Flapjack
         property :repeat_failure_delay do
           key :type, :integer
         end
+        property :initial_recovery_delay do
+          key :type, :integer
+        end
         property :relationships do
           key :"$ref", :CheckUpdateLinks
         end
@@ -372,7 +385,7 @@ module Flapjack
         @jsonapi_methods ||= {
           :post => Flapjack::Gateways::JSONAPI::Data::MethodDescriptor.new(
             :attributes => [:name, :enabled, :initial_failure_delay,
-                            :repeat_failure_delay],
+                            :repeat_failure_delay, :initial_recovery_delay],
             :descriptions => {
               :singular => "Create a check.",
               :multiple => "Create checks."
@@ -380,7 +393,8 @@ module Flapjack
           ),
           :get => Flapjack::Gateways::JSONAPI::Data::MethodDescriptor.new(
             :attributes => [:name, :enabled, :initial_failure_delay,
-                            :repeat_failure_delay, :ack_hash, :failing, :condition],
+                            :repeat_failure_delay, :initial_recovery_delay,
+                            :failing, :condition, :ack_hash],
             :descriptions => {
               :singular => "Returns data for a check.",
               :multiple => "Returns data for multiple check records."
@@ -388,7 +402,7 @@ module Flapjack
           ),
           :patch => Flapjack::Gateways::JSONAPI::Data::MethodDescriptor.new(
             :attributes => [:name, :enabled, :initial_failure_delay,
-                            :repeat_failure_delay],
+                            :repeat_failure_delay, :initial_recovery_delay],
             :descriptions => {
               :singular => "Update a check.",
               :multiple => "Update checks."

data/lib/flapjack/data/event.rb

@@ -14,8 +14,8 @@ module Flapjack
       # tags are now ignored, tags on the checks are used for rule matching
       REQUIRED_KEYS = %w(state check)
       OPTIONAL_KEYS = %w(entity time initial_failure_delay
-        repeat_failure_delay summary details acknowledgement_id duration tags
-        perfdata type)
+        repeat_failure_delay initial_recovery_delay summary details
+        acknowledgement_id duration tags perfdata type)
 
       VALIDATIONS = {
         proc {|e| e['state'].is_a?(String) &&
@@ -46,6 +46,11 @@ module Flapjack
                  (e['repeat_failure_delay'].is_a?(String) && !!(e['repeat_failure_delay'] =~ /^\d+$/)) } =>
           "repeat_failure_delay must be a positive integer, or a string castable to one",
 
+        proc {|e| e['initial_recovery_delay'].nil? ||
+                  e['initial_recovery_delay'].is_a?(Integer) ||
+                 (e['initial_recovery_delay'].is_a?(String) && !!(e['initial_recovery_delay'] =~ /^\d+$/)) } =>
+          "initial_recovery_delay must be a positive integer, or a string castable to one",
+
         proc {|e| e['summary'].nil? || e['summary'].is_a?(String) } =>
           "summary must be a string",
 
@@ -115,7 +120,8 @@ module Flapjack
       #   'check'                 => check,
       #   'time'                  => timestamp,
       #   'initial_failure_delay' => initial_failure_delay,
-      #   'repeat_failure_delay'  => repeat_failure_delay
+      #   'repeat_failure_delay'  => repeat_failure_delay,
+      #   'initial_recovery_delay' => initial_recovery_delay,
       #   'type'                  => 'service',
       #   'state'                 => state,
       #   'summary'               => check_output,
@@ -176,8 +182,8 @@ module Flapjack
           "#{attrs['entity']}:#{attrs['check']}"
         end
         [:state, :time, :initial_failure_delay, :repeat_failure_delay,
-         :summary, :details, :perfdata, :acknowledgement_id,
-         :duration].each do |key|
+         :initial_recovery_delay, :summary, :details, :perfdata,
+         :acknowledgement_id, :duration].each do |key|
 
           instance_variable_set("@#{key.to_s}", attrs[key.to_s])
         end
@@ -199,7 +205,8 @@ module Flapjack
         @state.downcase
       end
 
-      [:time, :initial_failure_delay, :repeat_failure_delay, :duration].each do |num_prop|
+      [:time, :initial_failure_delay, :repeat_failure_delay,
+       :initial_recovery_delay, :duration].each do |num_prop|
         define_method(num_prop) do
           prop = instance_variable_get("@#{num_prop}")
           return if prop.nil?

data/lib/flapjack/filters/delays.rb

@@ -28,66 +28,96 @@ module Flapjack
         initial_failure_delay = opts[:initial_failure_delay]
         repeat_failure_delay = opts[:repeat_failure_delay]
 
-        label = 'Filter: Delays:'
+        initial_recovery_delay = opts[:initial_recovery_delay]
 
-        if new_state.nil? || !new_state.action.nil? ||
-          Flapjack::Data::Condition.healthy?(new_state.condition)
+        label = 'Filter: Delays:'
 
+        if new_state.nil? || !new_state.action.nil?
           Flapjack.logger.debug {
-            "#{label} pass - not a service event in a failure state"
+            "#{label} pass - not a service event in a known state"
           }
           return false
         end
 
-        last_problem  = check.latest_notifications.
-          intersect(:condition => Flapjack::Data::Condition.unhealthy.keys).first
-        last_recovery = check.latest_notifications.
-          intersect(:condition => Flapjack::Data::Condition.healthy.keys).first
-        last_ack      = check.latest_notifications.
-          intersect(:action => 'acknowledgement').first
-
-        last_problem_time  = last_problem.nil?  ? nil : last_problem.created_at
-        last_notif = [last_problem, last_recovery, last_ack].compact.
-                       sort_by(&:created_at).last
-
-        last_change_time = old_state.nil? ? nil : old_state.created_at
-
-        alert_type = Flapjack::Data::Alert.notification_type(new_state.action,
-          new_state.condition)
-
-        last_alert_type = last_notif.nil? ? nil :
-          Flapjack::Data::Alert.notification_type(last_notif.action, last_notif.condition)
+        if (old_state.nil? || Flapjack::Data::Condition.healthy?(old_state.condition)) &&
+          !Flapjack::Data::Condition.healthy?(new_state.condition)
 
-        current_condition_duration = last_change_time.nil? ? nil : (timestamp - last_change_time)
-        time_since_last_alert = last_problem_time.nil? ? nil : (timestamp - last_problem_time)
-
-        Flapjack.logger.debug("#{label} last_problem: #{last_problem_time || 'nil'}, " +
-                      "last_change: #{last_change_time || 'nil'}, " +
-                      "current_condition_duration: #{current_condition_duration || 'nil'}, " +
-                      "time_since_last_alert: #{time_since_last_alert || 'nil'}, " +
-                      "alert type: [#{alert_type}], " +
-                      "last_alert_type == alert_type ? #{last_alert_type == alert_type}")
-
-        if !current_condition_duration.nil? && (current_condition_duration < initial_failure_delay)
-          Flapjack.logger.debug("#{label} block - duration of current failure " +
-                     "(#{current_condition_duration}) is less than failure_delay (#{initial_failure_delay})")
-          return true
-        end
-
-        if !(last_problem_time.nil? || time_since_last_alert.nil?) &&
-          (time_since_last_alert <= repeat_failure_delay) &&
-          (last_alert_type == alert_type)
+          # just failed
+          if initial_failure_delay > 0
+            Flapjack.logger.debug("#{label} block - just failed, failure_delay = #{initial_failure_delay}")
+            return true
+          end
+        elsif !old_state.nil? && !Flapjack::Data::Condition.healthy?(old_state.condition) &&
+          Flapjack::Data::Condition.healthy?(new_state.condition)
 
-          Flapjack.logger.debug("#{label} block - time since last alert for " +
-                        "current problem (#{time_since_last_alert}) is less than " +
-                        "repeat_failure_delay (#{repeat_failure_delay}) and last alert type (#{last_alert_type}) " +
-                        "is equal to current alert type (#{alert_type})")
-          return true
+          # just recovered
+          if initial_recovery_delay > 0
+            Flapjack.logger.debug("#{label} block - just recovered, recovery_delay = #{initial_recovery_delay}")
+            return true
+          end
+        else
+          last_change_time = old_state.nil? ? nil : old_state.created_at
+          current_condition_duration = last_change_time.nil? ? nil : (timestamp - last_change_time)
+
+          if Flapjack::Data::Condition.healthy?(new_state.condition)
+            if !current_condition_duration.nil? && (current_condition_duration < initial_recovery_delay)
+              Flapjack.logger.debug("#{label} block - duration of current success " +
+                         "(#{current_condition_duration}) is less than recovery_delay (#{initial_recovery_delay})")
+              return true
+            end
+
+            Flapjack.logger.debug("#{label} pass - not blocking due to recovery delay - " \
+              "current duration #{current_condition_duration}, initial_recovery_delay #{initial_recovery_delay}")
+            false
+          else
+            if !current_condition_duration.nil? && (current_condition_duration < initial_failure_delay)
+              Flapjack.logger.debug("#{label} block - duration of current failure " +
+                         "(#{current_condition_duration}) is less than failure_delay (#{initial_failure_delay})")
+              return true
+            end
+
+            last_problem  = check.latest_notifications.
+              intersect(:condition => Flapjack::Data::Condition.unhealthy.keys).first
+            last_recovery = check.latest_notifications.
+              intersect(:condition => Flapjack::Data::Condition.healthy.keys).first
+            last_ack      = check.latest_notifications.
+              intersect(:action => 'acknowledgement').first
+
+            last_problem_time  = last_problem.nil?  ? nil : last_problem.created_at
+            last_notif = [last_problem, last_recovery, last_ack].compact.
+                           sort_by(&:created_at).last
+
+            alert_type = Flapjack::Data::Alert.notification_type(new_state.action,
+              new_state.condition)
+
+            last_alert_type = last_notif.nil? ? nil :
+              Flapjack::Data::Alert.notification_type(last_notif.action, last_notif.condition)
+
+            time_since_last_alert = last_problem_time.nil? ? nil : (timestamp - last_problem_time)
+
+            Flapjack.logger.debug("#{label} last_problem: #{last_problem_time || 'nil'}, " +
+                          "last_change: #{last_change_time || 'nil'}, " +
+                          "current_condition_duration: #{current_condition_duration || 'nil'}, " +
+                          "time_since_last_alert: #{time_since_last_alert || 'nil'}, " +
+                          "alert type: [#{alert_type}], " +
+                          "last_alert_type == alert_type ? #{last_alert_type == alert_type}")
+
+            if !(last_problem_time.nil? || time_since_last_alert.nil?) &&
+              (time_since_last_alert <= repeat_failure_delay) &&
+              (last_alert_type == alert_type)
+
+              Flapjack.logger.debug("#{label} block - time since last alert for " +
+                            "current problem (#{time_since_last_alert}) is less than " +
+                            "repeat_failure_delay (#{repeat_failure_delay}) and last alert type (#{last_alert_type}) " +
+                            "is equal to current alert type (#{alert_type})")
+              return true
+            end
+
+            Flapjack.logger.debug("#{label} pass - not blocking because neither of the time comparison " +
+                          "conditions were met")
+            false
+          end
         end
-
-        Flapjack.logger.debug("#{label} pass - not blocking because neither of the time comparison " +
-                      "conditions were met")
-        false
       end
     end
   end