flapjack 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ee9f50915de6e7b9cf6b41ff8e8673521724be
-  data.tar.gz: f381a0c2be5382fe9f7cee78fb9216cd41234ca1
+  metadata.gz: ac75cd5f3cf88878ef41b54de2a1d4ca3007387e
+  data.tar.gz: 941ba78adea49cfa2025c5b848d7debf070d37b5
 SHA512:
-  metadata.gz: a11151cfb128667fd55e2d703e7a1faf56cb5e175d337c8507df68bc6f4a2cac9f6996012be16cec412de7d8409c1c2bfa16f28250ee701fd1edf01b110f5f9e
-  data.tar.gz: db3f5b366159a9250c1888850a63708fe3e8e7abb55221e11fc6a1f3053b46267f34f7d84e4f599c764915ff0bc03d1c83eeba017542da89bd9de710604e6519
+  metadata.gz: d55e5a48109d8eb7733dd45e854ac590b2f069fd6011aeb2017bbe0fbad66feacd41a460c5945bf42953f4afd3486f0be82c5155a3fce2f3ecb3d661c05919b8
+  data.tar.gz: 20666c66b76ef55c0105c1929a86073979280e11b91b31ac9498720bbb751dac3bd72fac3dba1bba747673275bb9bde1cb0f2b417f00f8a4eeed5348ac202505

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
   - "1.9.3"
-  - "2.0.0"
-  - "2.1.1"
+  - "2.0"
+  - "2.1"
 env:
   - ENTITIES=10 INTERVAL=120
 gemfile:
@@ -14,4 +14,4 @@ before_script:
 before_install:
   - git submodule update --init --recursive
   - gem install bundler
-script: bundle exec rspec spec && bundle exec cucumber features && bundle exec rake benchmarks:run
+script: bundle exec rspec spec && bundle exec cucumber features

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Flapjack Changelog
 
+# 0.8.9 - 2014-04-21
+- Feature: Support arbitrary gateways in notifier, queue names from config gh-456 (@auxesis)
+- Feature: Add chat bot features (ack by regex, query status by regex) gh-459 (@someword)
+- Feature: Add regex tags to notification rules gh-461 (@jswoods)
+
 # 0.8.8 - 2014-03-20
 - Feature: Be able to disable automatic sched maint by setting duration to zero gh-457, gh-458 (@portertech)
 - Bug: Make bin/flapjack-populator explicitly whinge about `-f` instead of dying gh-455 (@damncabbage)

data/features/notification_rules.feature

@@ -18,6 +18,7 @@ Feature: Notification rules on a per contact basis
       | 3   | baz            | c1,c3    |
       | 4   | buf            | c1,c2,c3 |
       | 5   | foo-app-01.xyz | c4,c6    |
+      | 6   | blakes7        | c2       |
 
     And user c1 has the following notification intervals:
       | email | sms |
@@ -43,11 +44,11 @@ Feature: Notification rules on a per contact basis
       | baz      |               | email         | sms,email        |                   |                    |                   |
 
     And user c2 has the following notification rules:
-      | entities | tags | warning_media | critical_media   | warning_blackhole | critical_blackhole |
-      |          |      | email         | email            |                   |                    |
-      |          |      | sms           | sms              |                   |                    |
-      | bar      |      | email         | email,sms        |                   |                    |
-      | bar      | wags |               |                  | true              | true               |
+      | entities    | tags | warning_media | critical_media   | warning_blackhole | critical_blackhole |
+      |             |      | email         | email            |                   |                    |
+      |             |      | sms           | sms              |                   |                    |
+      | bar,blakes7 |      | email         | email,sms        |                   |                    |
+      | bar,blakes7 | wags |               |                  | true              | true               |
 
     And user c3 has the following notification rules:
       | entities | warning_media | critical_media   | warning_blackhole | critical_blackhole |
@@ -188,7 +189,7 @@ Feature: Notification rules on a per contact basis
 
   @blackhole @time
   Scenario: Drop alerts matching a blackhole rule by tags
-    Given the check is check 'wags the dog' on entity 'bar'
+    Given the check is check 'wags the dog' on entity 'blakes7'
     And   the check is in an ok state
     When  a warning event is received
     And   1 minute passes

data/lib/flapjack/data/contact.rb

@@ -247,6 +247,7 @@ module Flapjack
           rule = self.add_notification_rule({
               :entities           => [],
               :tags               => Flapjack::Data::TagSet.new([]),
+              :regex_tags         => Flapjack::Data::TagSet.new([]),
               :time_restrictions  => [],
               :warning_media      => ALL_MEDIA,
               :critical_media     => ALL_MEDIA,

data/lib/flapjack/data/notification.rb

@@ -143,14 +143,16 @@ module Flapjack
             # matchers are rules of the contact that have matched the current event
             # for time, entity and tags
             matchers = rules.select do |rule|
-              logger.debug("considering rule with entities: #{rule.entities} and tags: #{rule.tags.to_json}")
-              rule_has_tags     = rule.tags     ? (rule.tags.length > 0)     : false
-              rule_has_entities = rule.entities ? (rule.entities.length > 0) : false
+              logger.debug("considering rule with entities: #{rule.entities}, tags: #{rule.tags.to_json} and regex tags: #{rule.regex_tags.to_json}")
+              rule_has_tags       = rule.tags       ? (rule.tags.length > 0)       : false
+              rule_has_regex_tags = rule.regex_tags ? (rule.regex_tags.length > 0) : false
+              rule_has_entities   = rule.entities   ? (rule.entities.length > 0)   : false
 
-              matches_tags   = rule_has_tags     ? rule.match_tags?(@tags)       : true
-              matches_entity = rule_has_entities ? rule.match_entity?(@event_id) : true
+              matches_tags       = rule_has_tags       ? rule.match_tags?(@tags)       : true
+              matches_regex_tags = rule_has_regex_tags ? rule.match_regex_tags?(@tags) : true
+              matches_entity     = rule_has_entities   ? rule.match_entity?(@event_id) : true
 
-              ((matches_entity && matches_tags) || ! rule.is_specific?) &&
+              ((matches_entity && matches_tags && matches_regex_tags) || ! rule.is_specific?) &&
                 rule_occurring_now?(rule, :contact => contact, :default_timezone => default_timezone)
             end
 

data/lib/flapjack/data/notification_rule.rb

@@ -12,8 +12,8 @@ module Flapjack
 
       extend Flapjack::Utility
 
-      attr_accessor :id, :contact_id, :entities, :tags, :time_restrictions,
-        :unknown_media, :warning_media, :critical_media,
+      attr_accessor :id, :contact_id, :entities, :tags, :regex_tags,
+        :time_restrictions, :unknown_media, :warning_media, :critical_media,
         :unknown_blackhole, :warning_blackhole, :critical_blackhole
 
       def self.exists_with_id?(rule_id, options = {})
@@ -74,7 +74,7 @@ module Flapjack
       end
 
       def to_json(*args)
-        self.class.hashify(:id, :contact_id, :tags, :entities,
+        self.class.hashify(:id, :contact_id, :tags, :regex_tags, :entities,
             :time_restrictions, :unknown_media, :warning_media, :critical_media,
             :unknown_blackhole, :warning_blackhole, :critical_blackhole) {|k|
           [k, self.send(k)]
@@ -93,6 +93,18 @@ module Flapjack
         @tags.subset?(event_tags)
       end
 
+      # regex_tags match?
+      def match_regex_tags?(event_tags)
+        return false unless @regex_tags && @regex_tags.length > 0
+        matches = 0
+        event_tags.each do |event_tag|
+          @regex_tags.each do |regex_tag|
+            matches += 1 if /#{regex_tag}/ === event_tag
+          end
+        end
+        matches >= @regex_tags.length
+      end
+
       def blackhole?(severity)
         ('unknown'.eql?(severity.downcase) && @unknown_blackhole) ||
           ('warning'.eql?(severity.downcase) && @warning_blackhole) ||
@@ -112,7 +124,8 @@ module Flapjack
 
       def is_specific?
         (!@entities.nil? && !@entities.empty?) ||
-          (!@tags.nil? && !@tags.empty?)
+          (!@tags.nil? && !@tags.empty?) ||
+          (!@regex_tags.nil? && !@regex_tags.empty?)
       end
 
     private
@@ -137,6 +150,9 @@ module Flapjack
         if rule_data[:tags].is_a?(Array)
           rule_data[:tags] = Flapjack::Data::TagSet.new(rule_data[:tags])
         end
+        if rule_data[:regex_tags].is_a?(Array)
+          rule_data[:regex_tags] = Flapjack::Data::TagSet.new(rule_data[:regex_tags])
+        end
         rule_data
       end
 
@@ -150,12 +166,14 @@ module Flapjack
         return errors unless errors.nil? || errors.empty?
 
         # whitelisting fields, rather than passing through submitted data directly
-        tag_data = rule_data[:tags].is_a?(Set) ? rule_data[:tags].to_a : nil
+        tag_data       = rule_data[:tags].is_a?(Set) ? rule_data[:tags].to_a : nil
+        regex_tag_data = rule_data[:regex_tags].is_a?(Set) ? rule_data[:regex_tags].to_a : nil
         json_rule_data = {
           :id                 => rule_data[:id].to_s,
           :contact_id         => rule_data[:contact_id].to_s,
           :entities           => Oj.dump(rule_data[:entities]),
           :tags               => Oj.dump(tag_data),
+          :regex_tags         => Oj.dump(regex_tag_data),
           :time_restrictions  => Oj.dump(rule_data[:time_restrictions], :mode => :compat),
           :unknown_media      => Oj.dump(rule_data[:unknown_media]),
           :warning_media      => Oj.dump(rule_data[:warning_media]),
@@ -250,6 +268,12 @@ module Flapjack
                  d[:tags].all? {|et| et.is_a?(String)} ) } =>
         "tags must be a tag_set of strings",
 
+        proc {|d| !d.has_key?(:regex_tags) ||
+               ( d[:regex_tags].nil? ||
+                 d[:regex_tags].is_a?(Flapjack::Data::TagSet) &&
+                 d[:regex_tags].all? {|et| et.is_a?(String)} ) } =>
+        "regex_tags must be a tag_set of strings",
+
         proc {|d| !d.has_key?(:time_restrictions) ||
                ( d[:time_restrictions].nil? ||
                  d[:time_restrictions].all? {|tr|
@@ -318,6 +342,8 @@ module Flapjack
         @contact_id         = rule_data['contact_id']
         tags                = Oj.load(rule_data['tags'] || '')
         @tags               = tags ? Flapjack::Data::TagSet.new(tags) : nil
+        regex_tags          = Oj.load(rule_data['regex_tags'] || '')
+        @regex_tags         = regex_tags ? Flapjack::Data::TagSet.new(regex_tags) : nil
         @entities           = Oj.load(rule_data['entities'] || '')
         @time_restrictions  = Oj.load(rule_data['time_restrictions'] || '')
         @unknown_media      = Oj.load(rule_data['unknown_media'] || '')

data/lib/flapjack/gateways/api/contact_methods.rb

@@ -144,7 +144,7 @@ module Flapjack
 
             contact = find_contact(params[:contact_id])
 
-            rule_data = hashify(:entities, :tags,
+            rule_data = hashify(:entities, :tags, :regex_tags,
               :unknown_media, :warning_media, :critical_media, :time_restrictions,
               :unknown_blackhole, :warning_blackhole, :critical_blackhole) {|k| [k, params[k]]}
 
@@ -167,7 +167,7 @@ module Flapjack
             rule = find_rule(params[:id])
             contact = find_contact(rule.contact_id)
 
-            rule_data = hashify(:entities, :tags,
+            rule_data = hashify(:entities, :tags, :regex_tags,
               :unknown_media, :warning_media, :critical_media, :time_restrictions,
               :unknown_blackhole, :warning_blackhole, :critical_blackhole) {|k| [k, params[k]]}
 

data/lib/flapjack/gateways/jabber.rb

@@ -160,7 +160,7 @@ module Flapjack
         out
       end
 
-      def interpreter(command_raw)
+      def interpreter(command_raw,from)
         msg          = nil
         action       = nil
         entity_check = nil
@@ -224,6 +224,10 @@ module Flapjack
         when /^help$/i
           msg = "commands: \n" +
                 "  ACKID <id> <comment> [duration: <time spec>]\n" +
+                "  ack entities /pattern/ <comment> [duration: <time spec>]\n" +
+                "  status entities /pattern/\n" +
+                "  ack checks /check_pattern/ on /entity_pattern/ <comment> [duration: <time spec>]\n" +
+                "  status checks /check_pattern/ on /entity_pattern/\n" +
                 "  find entities matching /pattern/\n" +
                 "  find checks[ matching /pattern/] on (<entity>|entities matching /pattern/)\n" +
                 "  test notifications for <entity>[:<check>]\n" +
@@ -358,6 +362,168 @@ module Flapjack
             msg = "that doesn't seem to be a valid pattern - /#{pattern}/"
           end
 
+        when /^(?:ack )?entities\s+\/(.+)\/(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/i
+          entity_pattern   = $1.chomp.strip
+          comment          = $2 ? $2.chomp.strip : nil
+          duration_str     = $3 ? $3.chomp.strip : '1 hour'
+          duration         = ChronicDuration.parse(duration_str)
+          entity_list      = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
+
+          if comment.nil? || (comment.length == 0)
+            comment = "#{from}: Set via chatbot"
+          else
+            comment = "#{from}: #{comment}"
+          end
+
+          if entity_list
+            number_found = entity_list.length
+            case
+            when number_found == 0
+              msg = "found no entities matching /#{pattern}/"
+            when number_found >= 1
+              failing_list = Flapjack::Data::EntityCheck.find_all_failing_by_entity(:redis => @redis)
+              entities = failing_list.select {|k,v| v.count >= 1 && entity_list.include?(k) }
+              if entities.length >= 1
+                entities.each_pair do |entity,check_list|
+                  check_list.each do |check|
+                    Flapjack::Data::Event.create_acknowledgement(
+                      entity, check,
+                      :summary => comment,
+                      :duration => duration,
+                      :redis => @redis
+                      )
+                  end
+                end
+                msg = failing_list.inject("Ack list:\n") {|memo,kv|
+                  kv[1].each {|e| memo << "#{kv[0]}:#{e}\n" }
+                  memo
+                }
+            else
+              msg = "found no matching entities with failing checks"
+            end
+          else
+            msg = "that doesn't seem to be a valid pattern - /#{pattern}/"
+          end
+        end
+
+        when /^(?:status )?entities\s+\/(.+)\/.*$/im
+          entity_pattern  = $1 ? $1.chomp.strip : nil
+          entity_names    = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
+
+          if entity_names
+            number_found = entity_names.length
+            case
+            when number_found == 0
+              msg = "found no entities matching /#{pattern}/"
+            when number_found >= 1
+              entities = entity_names.map {|name|
+                Flapjack::Data::Entity.find_by_name(name, :redis => @redis)
+              }.compact.inject({}) {|memo, entity|
+                memo[entity.name] = entity.check_list.map {|check_name|
+                  ec = Flapjack::Data::EntityCheck.for_entity(entity, check_name, :redis => @redis)
+                  "#{check_name}: #{ec.state}"
+                }
+                memo
+              }
+              msg = entities.inject("Status list:\n") {|memo,kv|
+                kv[1].each {|e| memo << "#{kv[0]}:#{e}\n"}
+                memo
+              }
+            else
+              msg = "found no matching entities with failing checks"
+            end
+          else
+            msg = "that doesn't seem to be a valid pattern - /#{pattern}/"
+          end
+
+        when /^(?:ack )?checks\s+\/(.+)\/\s+on\s+\/(.+)\/(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/i
+          check_pattern  = $1.chomp.strip
+          entity_pattern = $2.chomp.strip
+          comment        = $3 ? $3.chomp.strip : nil
+          duration_str   = $4 ? $4.chomp.strip : '1 hour'
+          duration       = ChronicDuration.parse(duration_str)
+          entity_list    = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
+
+          if comment.nil? || (comment.length == 0)
+            comment = "#{from}: Set via chatbot"
+          else
+            comment = "#{from}: #{comment}"
+          end
+
+          if entity_list
+            number_found = entity_list.length
+            case
+            when number_found == 0
+              msg = "found no entities matching /#{entity_pattern}/"
+            when number_found >= 1
+
+              failing_list = Flapjack::Data::EntityCheck.find_all_failing_by_entity(:redis => @redis)
+
+              my_failing_checks = Hash[failing_list.map do |k,v|
+                if entity_list.include?(k)
+                  [k, v.keep_if {|e| e =~ /#{check_pattern}/}].compact
+                end
+              end]
+              if my_failing_checks.delete_if {|k,v| v.empty? }.length >= 1
+                my_failing_checks.each_pair do |entity,check_list|
+                  check_list.each do |check|
+                    Flapjack::Data::Event.create_acknowledgement(
+                      entity, check,
+                      :summary => comment,
+                      :duration => duration,
+                      :redis => @redis
+                      )
+                  end
+                end
+                msg = failing_list.inject("Ack list:\n") {|memo,kv|
+                  kv[1].each {|e| memo << "#{kv[0]}:#{e}\n" }
+                  memo
+                }
+            else
+              msg = "found no matching failing checks"
+            end
+          else
+            msg = "that doesn't seem to be a valid pattern - /#{pattern}/"
+          end
+        end
+
+        when /^(?:status )checks\s+\/(.+?)\/(?:\s+on\s+)?(?:\/(.+)?\/)?/i
+          check_pattern  = $1 ? $1.chomp.strip : nil
+          entity_pattern = $2 ? $2.chomp.strip : '.*'
+          entity_names   = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
+
+          if entity_names
+            number_found = entity_names.length
+            case
+            when number_found == 0
+              msg = "found no entities matching /#{entity_pattern}/"
+            when number_found >= 1
+              entities = entity_names.map {|name|
+                Flapjack::Data::Entity.find_by_name(name, :redis => @redis)
+              }.compact.inject({}) {|memo, entity|
+                memo[entity.name] = entity.check_list.map {|check_name|
+                  if check_name =~ /#{check_pattern}/
+                    ec = Flapjack::Data::EntityCheck.for_entity(entity, check_name, :redis => @redis)
+                    "#{check_name}: #{ec.state}"
+                  end
+                }.compact
+                memo
+              }
+              if entities.delete_if {|k,v| v.empty? }.length >= 1
+                msg = entities.inject("Status list:\n") {|memo,kv|
+                  kv[1].each {|e| memo << "#{kv[0]}:#{e}\n" ; memo }
+                  memo
+                }
+              else
+                msg = "found no matching checks"
+              end
+            else
+              msg = "found no matching checks"
+            end
+          else
+            msg = "that doesn't seem to be a valid pattern - /#{pattern}/"
+          end
+
         when /^(.*)/
           words = $1
           msg   = "what do you mean, '#{words}'? Type 'help' for a list of acceptable commands."
@@ -372,11 +538,13 @@ module Flapjack
         @logger.debug("groupchat message received: #{stanza.inspect}")
 
         if stanza.body =~ /^#{@config['alias']}:\s+(.*)/m
-          command = $1
+          command  = $1
         end
 
+        from = stanza.from
+
         begin
-          results = interpreter(command)
+          results = interpreter(command, from.resource.to_s)
           msg     = results[:msg]
           action  = results[:action]
         rescue => e
@@ -387,7 +555,7 @@ module Flapjack
         if msg || action
           EventMachine::Synchrony.next_tick do
             @logger.info("sending to group chat: #{msg}")
-            say(stanza.from.stripped, msg, :groupchat)
+            say(from.stripped, msg, :groupchat)
             action.call if action
           end
         end

data/lib/flapjack/gateways/web/views/contact.html.erb

@@ -103,6 +103,7 @@
       <th>ID</th>
       <th>Entities</th>
       <th>Tags</th>
+      <th>Regex Tags</th>
       <th>Warning Media</th>
       <th>Critical Media</th>
       <th>Time Restrictions</th>
@@ -113,6 +114,7 @@
         <td><%= h rule.id %></td>
         <td><%= h( (rule.entities && !rule.entities.empty?) ? rule.entities.join(', ') : '-') %></td>
         <td><%= h( (rule.tags && !rule.tags.empty?) ? rule.tags.to_a.join(', ') : '-') %></td>
+        <td><%= h( (rule.regex_tags && !rule.regex_tags.empty?) ? rule.regex_tags.to_a.join(', ') : '-') %></td>
         <td><%= h( (rule.warning_media && !rule.warning_media.empty?) ? rule.warning_media.join(', ') : '-')%></td>
         <td><%= h( (rule.critical_media && !rule.critical_media.empty?) ? rule.critical_media.join(', ') : '-') %></td>
         <td><%= h(rule.time_restrictions) %></td>

data/lib/flapjack/notifier.rb

@@ -30,10 +30,8 @@ module Flapjack
 
       @notifications_queue = @config['queue'] || 'notifications'
 
-      @queues = {:email     => @config['email_queue'],
-                 :sms       => @config['sms_queue'],
-                 :jabber    => @config['jabber_queue'],
-                 :pagerduty => @config['pagerduty_queue']}
+      queue_configs = @config.find_all {|k, v| k =~ /_queue$/ }
+      @queues = Hash[queue_configs.map {|k, v| [k[/^(.*)_queue$/, 1], v] }]
 
       notify_logfile  = @config['notification_log_file'] || 'log/notify.log'
       if not File.directory?(File.dirname(notify_logfile))
@@ -133,7 +131,7 @@ module Flapjack
         @notifylog.info("#{event_id} | " +
           "#{notification.type} | #{message.contact.id} | #{media_type} | #{address}")
 
-        unless @queues[media_type.to_sym]
+        unless @queues[media_type.to_s]
           @logger.error("no queue for media type: #{media_type}")
           return
         end
@@ -160,16 +158,15 @@ module Flapjack
         contents_tags = contents['tags']
         contents['tags'] = contents_tags.is_a?(Set) ? contents_tags.to_a : contents_tags
 
-        # TODO consider changing Resque jobs to use raw blpop like the others
         case media_type.to_sym
         when :sms
-          Resque.enqueue_to(@queues[:sms], Flapjack::Gateways::SmsMessagenet, contents)
+          # FIXME(@auxesis): change Resque jobs to use raw blpop
+          Resque.enqueue_to(@queues['sms'], Flapjack::Gateways::SmsMessagenet, contents)
         when :email
-          Resque.enqueue_to(@queues[:email], Flapjack::Gateways::Email, contents)
-        when :jabber
-          @redis.rpush(@queues[:jabber], Oj.dump(contents))
-        when :pagerduty
-          @redis.rpush(@queues[:pagerduty], Oj.dump(contents))
+          # FIXME(@auxesis): change Resque jobs to use raw blpop
+          Resque.enqueue_to(@queues['email'], Flapjack::Gateways::Email, contents)
+        else
+          @redis.rpush(@queues[media_type.to_s], Oj.dump(contents))
         end
       end
     end

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end
 

data/spec/lib/flapjack/data/notification_rule_spec.rb

@@ -15,6 +15,22 @@ describe Flapjack::Data::NotificationRule, :redis => true do
   let(:rule_data) {
     {:contact_id         => '23',
      :tags               => ["database","physical"],
+     :regex_tags         => [],
+     :entities           => ["foo-app-01.example.com"],
+     :time_restrictions  => [ weekdays_8_18 ],
+     :unknown_media      => [],
+     :warning_media      => ["email"],
+     :critical_media     => ["sms", "email"],
+     :unknown_blackhole  => false,
+     :warning_blackhole  => false,
+     :critical_blackhole => false
+    }
+  }
+
+  let(:regex_rule_data) {
+    {:contact_id         => '23',
+     :tags               => [],
+     :regex_tags         => ["^data.*$","^(physical|bare_metal)$"],
      :entities           => ["foo-app-01.example.com"],
      :time_restrictions  => [ weekdays_8_18 ],
      :unknown_media      => [],
@@ -34,6 +50,10 @@ describe Flapjack::Data::NotificationRule, :redis => true do
     Flapjack::Data::NotificationRule.add(rule_data, :redis => @redis)
   }
 
+  let(:existing_regex_rule) {
+    Flapjack::Data::NotificationRule.add(regex_rule_data, :redis => @redis)
+  }
+
   it "checks that a notification rule exists" do
     expect(Flapjack::Data::NotificationRule.exists_with_id?(existing_rule.id, :redis => @redis)).to be true
     expect(Flapjack::Data::NotificationRule.exists_with_id?('not_there', :redis => @redis)).to be false
@@ -87,6 +107,15 @@ describe Flapjack::Data::NotificationRule, :redis => true do
     expect(rule.match_tags?(['virtual'].to_set)).to be false
   end
 
+  it "checks whether entity tags match a regex" do
+    rule = existing_regex_rule
+
+    expect(rule.match_regex_tags?(['database', 'physical'].to_set)).to be true
+    expect(rule.match_regex_tags?(['database', 'physical', 'beetroot'].to_set)).to be true
+    expect(rule.match_regex_tags?(['database'].to_set)).to be false
+    expect(rule.match_regex_tags?(['virtual'].to_set)).to be false
+  end
+
   it "checks if blackhole settings for a rule match a severity level" do
     rule_data[:warning_blackhole] = true
     rule = Flapjack::Data::NotificationRule.add(rule_data, :redis => @redis)

data/spec/lib/flapjack/gateways/api/contact_methods_spec.rb

@@ -42,6 +42,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   let(:notification_rule_data) {
     {"contact_id"         => "21",
      "tags"               => ["database","physical"],
+     "regex_tags"         => ["^data.*$","^(physical|bare_metal)$"],
      "entities"           => ["foo-app-01.example.com"],
      "time_restrictions"  => nil,
      "unknown_media"      => ["jabber"],

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

@@ -54,6 +54,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   it "receives an acknowledgement message" do
     expect(stanza).to receive(:body).and_return('flapjack: ACKID 1f8ac10f fixing now duration: 90m')
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
@@ -89,6 +90,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
                  '<a href="http://example.org/">example.org</a></span>')
 
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
@@ -121,6 +123,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
       and_return("flapjack: tell me about \nexample.com")
 
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 
@@ -151,6 +154,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
   it "receives a message it doesn't understand" do
     expect(stanza).to receive(:body).once.and_return('flapjack: hello!')
     from = double('from')
+    expect(from).to receive(:resource).and_return('sender')
     expect(from).to receive(:stripped).and_return('sender')
     expect(stanza).to receive(:from).and_return(from)
 

data/spec/lib/flapjack/gateways/jsonapi/contact_methods_spec.rb

@@ -44,6 +44,7 @@ describe 'Flapjack::Gateways::JSONAPI::ContactMethods', :sinatra => true, :logge
   let(:notification_rule_data) {
     {"contact_id"         => "21",
      "tags"               => ["database","physical"],
+     "regex_tags"         => ["^data.*$","^(physical|bare_metal)$"],
      "entities"           => ["foo-app-01.example.com"],
      "time_restrictions"  => nil,
      "unknown_media"      => ["jabber"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante