flapjack 0.7.12 → 0.7.13

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.7.13 - 2013-06-18
+- Bug: test notifications are blocked by notification rules gh-188 (@jessereynolds)
+- Bug: unscheduled maintenances does not prevent alerts for checks with colons in their name gh-208 (@jessereynolds)
+
 # 0.7.12 - 2013-06-12
 - Feature: auto-generate a general notification rule for contacts that don't have any gh-199 (@ali-graham)
 - Bug: no recovery for unknown for contact with notification rules gh-203 (@jessereynolds)

data/features/events_check_names.feature

@@ -0,0 +1,21 @@
+@events
+Feature: events and check names
+  Flapjack must handle weird characters in check names in events
+
+  Background:
+    Given an entity 'foo-app-01.example.com' exists
+
+  @time
+  Scenario: acknowledgements for checks with colons
+    Given the check is check 'Disk C: Utilisation' on entity 'foo-app-01.example.com'
+    And   the check is in an ok state
+    When  a warning event is received
+    Then  a notification should not be generated
+    When  1 minute passes
+    And   a warning event is received
+    Then  a notification should be generated
+    When  an acknowledgement event is received
+    Then  a notification should be generated
+    When  1 minute passes
+    And   a warning event is received
+    Then  a notification should not be generated

data/features/notification_rules.feature

@@ -260,6 +260,50 @@ Feature: Notification rules on a per contact basis
     Then  0 email alerts should be queued for vera@example.com
     Then  1 sms alert should be queued for +61400000003
 
+  @time
+  Scenario: Test notifications behave like a critical notification
+    Given the check is check 'ping' on entity 'foo'
+    And   the check is in an ok state
+    When  a test event is received
+    Then  1 email alert should be queued for malak@example.com
+    And   1 sms alert should be queued for +61400000001
+  @time
+  Scenario: Critical straight after test
+    Given the check is check 'ping' on entity 'foo'
+    And   the check is in an ok state
+    When  a test event is received
+    Then  1 email alert should be queued for malak@example.com
+    And   1 sms alert should be queued for +61400000001
+    When  10 seconds passes
+    And   a critical event is received
+    Then  1 email alert should be queued for malak@example.com
+    And   1 sms alert should be queued for +61400000001
+    When  40 seconds passes
+    And   a critical event is received
+    Then  2 email alert should be queued for malak@example.com
+    And   2 sms alert should be queued for +61400000001
+
+  Scenario: Unknown event during unscheduled maintenance
+    Given the check is check 'ping' on entity 'foo'
+    And   the check is in an ok state
+    When  an unknown event is received
+    And   1 minute passes
+    And   an unknown event is received
+    Then  1 email alert should be queued for malak@example.com
+    And   1 sms alert should be queued for +61400000001
+    When  6 minutes passes
+    And   an acknowledgement event is received
+    Then  2 email alerts should be queued for malak@example.com
+    And   2 sms alerts should be queued for +61400000001
+    When  6 minutes passes
+    And   an unknown event is received
+    Then  2 email alerts should be queued for malak@example.com
+    And   2 sms alerts should be queued for +61400000001
+    When  1 minute passes
+    And   an unknown event is received
+    Then  2 email alerts should be queued for malak@example.com
+    And   2 sms alerts should be queued for +61400000001
+
   @time
   Scenario: A blackhole rule on an entity should override another matching entity specific rule
 

data/features/steps/events_steps.rb

@@ -118,7 +118,18 @@ def submit_acknowledgement(entity, check)
     'entity'             => entity,
     'check'              => check,
     'client'             => 'clientx',
-    # 'acknowledgement_id' =>
+  }
+  submit_event(event)
+end
+
+def submit_test(entity, check)
+  event = {
+    'type'               => 'action',
+    'state'              => 'test_notifications',
+    'summary'            => "test notification for all contacts interested in #{entity}",
+    'entity'             => entity,
+    'check'              => check,
+    'client'             => 'clientx',
   }
   submit_event(event)
 end
@@ -224,6 +235,13 @@ When /^an acknowledgement .*is received(?: for check '([\w\.\-]+)' on entity '([
   drain_events
 end
 
+When /^a test .*is received(?: for check '([\w\.\-]+)' on entity '([\w\.\-]+)')?$/ do |check, entity|
+  check  ||= @check
+  entity ||= @entity
+  submit_test(entity, check)
+  drain_events
+end
+
 # TODO logging is a side-effect, should test for notification generation itself
 Then /^a notification should not be generated(?: for check '([\w\.\-]+)' on entity '([\w\.\-]+)')?$/ do |check, entity|
   check  ||= @check

data/lib/flapjack/data/entity.rb

@@ -87,7 +87,7 @@ module Flapjack
           return nil
         end
         redis.keys('entity_id:*').inject([]) {|memo, check|
-          a, entity_name = check.split(':')
+          a, entity_name = check.split(':', 2)
           if (entity_name =~ regex) && !memo.include?(entity_name)
             memo << entity_name
           end

data/lib/flapjack/data/entity_check.rb

@@ -27,7 +27,7 @@ module Flapjack
       # TODO probably shouldn't always be creating on query -- work out when this should be happening
       def self.for_event_id(event_id, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
-        entity_name, check = event_id.split(':')
+        entity_name, check = event_id.split(':', 2)
         self.new(Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis, :create => true), check,
           :redis => redis)
       end

data/lib/flapjack/data/notification.rb

@@ -26,7 +26,7 @@ module Flapjack
         event_id = event.id
         event_state = event.state
 
-        severity = if ([event_state, max_notified_severity] & ['critical', 'unknown']).any?
+        severity = if ([event_state, max_notified_severity] & ['critical', 'unknown', 'test_notifications']).any?
           'critical'
         elsif [event_state, max_notified_severity].include?('warning')
           'warning'

data/lib/flapjack/gateways/email.rb

@@ -34,7 +34,7 @@ module Flapjack
           @summary                    = notification['summary']
           @details                    = notification['details']
           @time                       = notification['time']
-          @entity_name, @check        = notification['event_id'].split(':')
+          @entity_name, @check        = notification['event_id'].split(':', 2)
 
           entity_check = Flapjack::Data::EntityCheck.for_event_id(notification['event_id'],
             :redis => ::Resque.redis)

data/lib/flapjack/gateways/jabber.rb

@@ -355,7 +355,7 @@ module Flapjack
                 end
               end
             else
-              entity, check = event['event_id'].split(':')
+              entity, check = event['event_id'].split(':', 2)
               state         = event['state']
               summary       = event['summary']
               duration      = event['duration'] ? time_period_in_words(event['duration']) : '4 hours'

data/lib/flapjack/gateways/pagerduty.rb

@@ -61,7 +61,7 @@ module Flapjack
           @logger.debug("pagerduty notification event popped off the queue: " + event.inspect)
           unless 'shutdown'.eql?(type)
             event_id      = event['event_id']
-            entity, check = event_id.split(':')
+            entity, check = event_id.split(':', 2)
             state         = event['state']
             summary       = event['summary']
             address       = event['address']

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -24,7 +24,7 @@ module Flapjack
           state              = notification['state']
           summary            = notification['summary']
           time               = notification['time']
-          entity, check      = notification['event_id'].split(':')
+          entity, check      = notification['event_id'].split(':', 2)
 
           headline_map = {'problem'         => 'PROBLEM: ',
                           'recovery'        => 'RECOVERY: ',

data/lib/flapjack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -412,6 +412,7 @@ files:
 - dist/puppet/sqlite3/manifests/dev.pp
 - etc/flapjack_config.yaml.example
 - features/events.feature
+- features/events_check_names.feature
 - features/notification_rules.feature
 - features/notifications.feature
 - features/packaging-lintian.feature
@@ -553,7 +554,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3589199594353387110
+      hash: 1459875303565561678
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -562,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3589199594353387110
+      hash: 1459875303565561678
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -571,6 +572,7 @@ specification_version: 3
 summary: Intelligent, scalable, distributed monitoring notification system.
 test_files:
 - features/events.feature
+- features/events_check_names.feature
 - features/notification_rules.feature
 - features/notifications.feature
 - features/packaging-lintian.feature