flapjack 0.7.9 → 0.7.10

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Flapjack Changelog
 
+# 0.7.10 - 2013-06-05
+- Bug: unknown events not fully treated as problems - no notification delay blocking gh-154 (@jessereynolds)
+
 # 0.7.9 - 2013-06-04
 - Feature: Include summary and details in the /status API call gh-179 (@ali-graham)
 

data/features/events.feature

@@ -186,6 +186,24 @@ Feature: events
     And   an ok event is received
     Then  a notification should not be generated
 
+  @time
+  Scenario: Quick stream of unknown
+    Given the check is in an ok state
+    When  an unknown event is received
+    Then  a notification should not be generated
+    When  60 seconds passes
+    And   an unknown event is received
+    Then  a notification should be generated
+    When  10 seconds passes
+    And   an unknown event is received
+    Then  a notification should not be generated
+    When  10 seconds passes
+    And   an unknown event is received
+    Then  a notification should not be generated
+    When  10 seconds passes
+    And   an unknown event is received
+    Then  a notification should not be generated
+
   @time
   Scenario: Flapper (down for one minute, up for one minute, repeat)
     Given the check is in an ok state

data/features/steps/events_steps.rb

@@ -98,6 +98,18 @@ def submit_critical(entity, check)
   submit_event(event)
 end
 
+def submit_unknown(entity, check)
+  event = {
+    'type'    => 'service',
+    'state'   => 'unknown',
+    'summary' => 'check execution error',
+    'entity'  => entity,
+    'check'   => check,
+    'client'  => 'clientx'
+  }
+  submit_event(event)
+end
+
 def submit_acknowledgement(entity, check)
   event = {
     'type'               => 'action',
@@ -198,6 +210,13 @@ When /^a warning event is received(?: for check '([\w\.\-]+)' on entity '([\w\.\
   drain_events
 end
 
+When /^an unknown event is received(?: for check '([\w\.\-]+)' on entity '([\w\.\-]+)')?$/ do |check, entity|
+  check  ||= @check
+  entity ||= @entity
+  submit_unknown(entity, check)
+  drain_events
+end
+
 When /^an acknowledgement .*is received(?: for check '([\w\.\-]+)' on entity '([\w\.\-]+)')?$/ do |check, entity|
   check  ||= @check
   entity ||= @entity

data/lib/flapjack/data/contact.rb

@@ -131,27 +131,24 @@ module Flapjack
               entity_id = $1
               check = $2
 
-              unless ret.has_key?(entity_id)
-                ret[entity_id] = {}
-                if entity_name = @redis.hget("entity:#{entity_id}", 'name')
-                  entity = Flapjack::Data::Entity.new(:name => entity_name,
-                             :id => entity_id, :redis => @redis)
-                  ret[entity_id][:entity] = entity
-                end
-                if options[:checks]
-                  # using a set to ensure unique check values
-                  ret[entity_id][:checks] = Set.new
-                end
+              entity = nil
+
+              if ret.has_key?(entity_id)
+                entity = ret[entity_id][:entity]
+              else
+                entity = Flapjack::Data::Entity.find_by_id(entity_id, :redis => @redis)
+                ret[entity_id] = {
+                  :entity => entity
+                }
+                # using a set to ensure unique check values
+                ret[entity_id][:checks] = Set.new if options[:checks]
+                ret[entity_id][:tags] = entity.tags if entity && options[:tags]
               end
 
               if options[:checks]
                 # if not registered for the check, then was registered for
                 # the entity, so add all checks
-                ret[entity_id][:checks] |= (check || entity.check_list)
-              end
-
-              if options[:tags]
-                ret[entity_id][:tags] = entity.tags
+                ret[entity_id][:checks] |= (check || (entity ? entity.check_list : []))
               end
             end
           end

data/lib/flapjack/data/entity_check.rb

@@ -286,6 +286,12 @@ module Flapjack
         lcn.to_i
       end
 
+      def last_unknown_notification
+        lcn = @redis.get("#{@key}:last_unknown_notification")
+        return unless (lcn && lcn =~ /^\d+$/)
+        lcn.to_i
+      end
+
       def last_recovery_notification
         lrn = @redis.get("#{@key}:last_recovery_notification")
         return unless (lrn && lrn =~ /^\d+$/)
@@ -302,6 +308,7 @@ module Flapjack
         ln = {:problem         => last_problem_notification,
               :warning         => last_warning_notification,
               :critical        => last_critical_notification,
+              :unknown         => last_unknown_notification,
               :recovery        => last_recovery_notification,
               :acknowledgement => last_acknowledgement_notification }
         ln

data/lib/flapjack/version.rb

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

metadata

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