flapjack 0.7.10 → 0.7.11

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.7.11 - 2013-06-11
+- Bug: unknown events not fully treated as problems - no notification delay blocking (second swing) gh-154 (@jessereynolds)
+- Bug: correct jabber alias in example acknowledgement strings (second swing) gh-189 (@jessereynolds)
+
 # 0.7.10 - 2013-06-05
 - Bug: unknown events not fully treated as problems - no notification delay blocking gh-154 (@jessereynolds)
 

data/bin/simulate-failed-check

@@ -26,17 +26,18 @@ def fail(opts)
   redis = Redis.new(opts[:redis_options])
   stop_after = opts[:minutes].to_i * 60
   recover = opts[:recover]
+  state = opts[:state] || 'critical'
   event  = {
     'entity'    => opts[:entity] || 'foo-app-01',
     'check'     => opts[:check]  || 'HTTP',
     'type'      => 'service',
     'timestamp' => Time.now.to_i
   }
-  failure  = event.merge('state' => 'critical', 'summary' => 'Connection refused')
-  recovery = event.merge('state' => 'ok',       'summary' => '200 OK, 37 ms')
+  failure  = event.merge('state' => state, 'summary' => 'Simulated check output (test by operator)')
+  recovery = event.merge('state' => 'ok',  'summary' => 'Simulated check output (test by operator)')
   key = "#{event['entity']}:#{event['check']}"
 
-  puts "#{Time.now}: sending failure event for #{key}"
+  puts "#{Time.now}: sending failure event (#{state}) for #{key}"
   send_event(failure, :redis => redis)
 
   EM.run {
@@ -51,7 +52,7 @@ def fail(opts)
     end
 
     EM.add_periodic_timer(10) do
-      puts "#{Time.now}: sending failure event for #{key}"
+      puts "#{Time.now}: sending failure event (#{state}) for #{key}"
       send_event(failure, :redis => redis)
     end
 
@@ -92,6 +93,10 @@ optparse = OptionParser.new do |opts|
     options.check = k
   end
 
+  opts.on("-s", "--state STATE", String, "optional STATE to generate failure events with ('CRITICAL')") do |s|
+    options.state = s
+  end
+
 end
 optparse.parse!(ARGV)
 
@@ -125,7 +130,7 @@ if config_env.nil? || config_env.empty?
 end
 
 options = {:redis_options => redis_options, :minutes => options.minutes,
-           :entity => options.entity, :check => options.check}
+           :entity => options.entity, :check => options.check, :state => options.state}
 case ARGV[0]
 when "fail-and-recover"
   fail(options.merge(:recover => true))

data/features/events.feature

@@ -189,7 +189,12 @@ Feature: events
   @time
   Scenario: Quick stream of unknown
     Given the check is in an ok state
-    When  an unknown event is received
+    When  a critical event is received
+    And   1 minute passes
+    And   a critical event is received
+    Then  a notification should be generated
+    When  10 minutes passes
+    And   an unknown event is received
     Then  a notification should not be generated
     When  60 seconds passes
     And   an unknown event is received
@@ -203,6 +208,27 @@ Feature: events
     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
+    When  10 seconds passes
+    And   an unknown event is received
+    Then  a notification should not be generated
+    When  5 minutes 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)

data/lib/flapjack/data/entity_check.rb

@@ -305,8 +305,7 @@ module Flapjack
       end
 
       def last_notifications_of_each_type
-        ln = {:problem         => last_problem_notification,
-              :warning         => last_warning_notification,
+        ln = {:warning         => last_warning_notification,
               :critical        => last_critical_notification,
               :unknown         => last_unknown_notification,
               :recovery        => last_recovery_notification,

data/lib/flapjack/gateways/jabber.rb

@@ -368,7 +368,7 @@ module Flapjack
                 !state.eql?('ok') &&
                 !'acknowledgement'.eql?(type) &&
                 !'test'.eql?(type) ?
-                "::: flapjack: ACKID #{event['event_count']} " : ''
+                "::: #{@config['alias']}: ACKID #{event['event_count']} " : ''
 
               type = 'unknown' unless type
 

data/lib/flapjack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-11 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: 1212130592798831749
+      hash: -3678389315543447731
 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: 1212130592798831749
+      hash: -3678389315543447731
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23