flapjack 0.7.20 → 0.7.21

data/lib/flapjack/data/notification_rule.rb

@@ -4,6 +4,7 @@ require 'oj'
 require 'active_support/time'
 require 'ice_cube'
 require 'flapjack/utility'
+require 'flapjack/data/tag_set'
 
 module Flapjack
   module Data
@@ -11,7 +12,7 @@ module Flapjack
 
       extend Flapjack::Utility
 
-      attr_accessor :id, :contact_id, :entities, :entity_tags, :time_restrictions,
+      attr_accessor :id, :contact_id, :entities, :tags, :time_restrictions,
         :warning_media, :critical_media, :warning_blackhole, :critical_blackhole
 
       def self.exists_with_id?(rule_id, options = {})
@@ -68,19 +69,23 @@ module Flapjack
       end
 
       def to_json(*args)
-        self.class.hashify(:id, :contact_id, :entity_tags, :entities,
+        self.class.hashify(:id, :contact_id, :tags, :entities,
             :time_restrictions, :warning_media, :critical_media,
             :warning_blackhole, :critical_blackhole) {|k|
           [k, self.send(k)]
         }.to_json
       end
 
-      # tags or entity names match?
-      # nil @entity_tags and nil @entities matches
-      def match_entity?(event)
-        # TODO: return true if event's entity tags match entity tag list on the rule
-        ((@entity_tags.nil? || @entity_tags.empty?) && (@entities.nil? || @entities.empty?)) ||
-         (@entities.include?(event.split(':').first))
+      # entity names match?
+      def match_entity?(event_id)
+        return false unless @entities
+        @entities.include?(event_id.split(':').first)
+      end
+
+      # tags match?
+      def match_tags?(event_tags)
+        return false unless @tags && @tags.length > 0
+        @tags.subset?(event_tags)
       end
 
       def blackhole?(severity)
@@ -99,7 +104,7 @@ module Flapjack
 
       def is_specific?
         (!@entities.nil? && !@entities.empty?) ||
-          (!@entity_tags.nil? && !@entity_tags.empty?)
+          (!@tags.nil? && !@tags.empty?)
       end
 
     private
@@ -120,17 +125,21 @@ module Flapjack
         # make some assumptions about the incoming data
         rule_data[:warning_blackhole]  = rule_data[:warning_blackhole] || false
         rule_data[:critical_blackhole] = rule_data[:critical_blackhole] || false
+        if rule_data[:tags].is_a?(Array)
+          rule_data[:tags] = Flapjack::Data::TagSet.new(rule_data[:tags])
+        end
 
         errors = self.validate_data(rule_data, options)
 
         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
         json_rule_data = {
           :id                 => rule_data[:id].to_s,
           :contact_id         => rule_data[:contact_id].to_s,
           :entities           => Oj.dump(rule_data[:entities]),
-          :entity_tags        => Oj.dump(rule_data[:entity_tags]),
+          :tags               => Oj.dump(tag_data),
           :time_restrictions  => Oj.dump(rule_data[:time_restrictions]),
           :warning_media      => Oj.dump(rule_data[:warning_media]),
           :critical_media     => Oj.dump(rule_data[:critical_media]),
@@ -221,19 +230,11 @@ module Flapjack
                                 d[:entities].all? {|e| e.is_a?(String)} ) } =>
                        "entities must be a list of strings",
 
-                       proc { !d.has_key?(:entity_tags) ||
-                              ( d[:entity_tags].nil? ||
-                                d[:entity_tags].is_a?(Array) &&
-                                d[:entity_tags].all? {|et| et.is_a?(String)} ) } =>
-                       "entity_tags must be a list of strings",
-
-                       #proc { (d.has_key?(:entities) &&
-                       #        d[:entities].is_a?(Array) &&
-                       #        (d[:entities].size > 0)) ||
-                       #       (d.has_key?(:entity_tags) &&
-                       #        d[:entity_tags].is_a?(Array) &&
-                       #        (d[:entity_tags].size > 0)) } =>
-                       #"entities or entity tags must have at least one value",
+                       proc { !d.has_key?(:tags) ||
+                              ( d[:tags].nil? ||
+                                d[:tags].is_a?(Flapjack::Data::TagSet) &&
+                                d[:tags].all? {|et| et.is_a?(String)} ) } =>
+                       "tags must be a tag_set of strings",
 
                        proc { !d.has_key?(:time_restrictions) ||
                               ( d[:time_restrictions].nil? ||
@@ -284,7 +285,8 @@ module Flapjack
         rule_data = @redis.hgetall("notification_rule:#{@id}")
 
         @contact_id         = rule_data['contact_id']
-        @entity_tags        = Oj.load(rule_data['entity_tags'] || '')
+        tags                = Oj.load(rule_data['tags'] || '')
+        @tags               = tags ? Flapjack::Data::TagSet.new(tags) : nil
         @entities           = Oj.load(rule_data['entities'] || '')
         @time_restrictions  = Oj.load(rule_data['time_restrictions'] || '')
         @warning_media      = Oj.load(rule_data['warning_media'] || '')

data/lib/flapjack/data/tag.rb

@@ -25,6 +25,11 @@ module Flapjack
                  :redis => opts[:redis])
       end
 
+      def self.find_intersection(tags, opts)
+        @redis = opts[:redis]
+        @redis.sinter(tags)
+      end
+
       def self.create(name, enum = [], opts)
         self.new(:name => name,
                  :create => enum,

data/lib/flapjack/gateways/api.rb

@@ -45,7 +45,7 @@ module Flapjack
 
       class << self
         def start
-          @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 1)
+          @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 2)
 
           @logger.info "starting api - class"
 

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

@@ -142,7 +142,7 @@ module Flapjack
 
             contact = find_contact(params[:contact_id])
 
-            rule_data = hashify(:entities, :entity_tags,
+            rule_data = hashify(:entities, :tags,
               :warning_media, :critical_media, :time_restrictions,
               :warning_blackhole, :critical_blackhole) {|k| [k, params[k]]}
 
@@ -165,7 +165,7 @@ module Flapjack
             rule = find_rule(params[:id])
             contact = find_contact(rule.contact_id)
 
-            rule_data = hashify(:entities, :entity_tags,
+            rule_data = hashify(:entities, :tags,
               :warning_media, :critical_media, :time_restrictions,
               :warning_blackhole, :critical_blackhole) {|k| [k, params[k]]}
 
@@ -339,4 +339,4 @@ module Flapjack
 
   end
 
-end
+end

data/lib/flapjack/gateways/email.rb

@@ -3,6 +3,7 @@
 require 'mail'
 require 'erb'
 require 'socket'
+require 'chronic_duration'
 
 require 'em-synchrony'
 require 'em/protocols/smtpclient'
@@ -28,61 +29,86 @@ module Flapjack
         end
 
         def perform(notification)
-          @logger.debug "Woo, got a notification to send out: #{notification.inspect}"
-
-          @notification_type          = notification['notification_type']
-          @contact_first_name         = notification['contact_first_name']
-          @contact_last_name          = notification['contact_last_name']
-          @state                      = notification['state']
-          @summary                    = notification['summary']
-          @last_state                 = notification['last_state']
-          @last_summary               = notification['last_summary']
-          @details                    = notification['details']
-          @time                       = notification['time']
-          @relative                   = relative_time_ago(Time.at(@time))
-          @entity_name, @check        = notification['event_id'].split(':', 2)
-
-          entity_check = Flapjack::Data::EntityCheck.for_event_id(notification['event_id'],
-            :redis => ::Resque.redis)
-
-          @in_unscheduled_maintenance = entity_check.in_scheduled_maintenance?
-          @in_scheduled_maintenance   = entity_check.in_unscheduled_maintenance?
-
-          headline_map = {'problem'         => 'Problem: ',
-                          'recovery'        => 'Recovery: ',
-                          'acknowledgement' => 'Acknowledgement: ',
-                          'test'            => 'Test Notification: ',
-                          'unknown'         => ''
-                         }
-
-          headline = headline_map[@notification_type] || ''
-
-          @subject = "#{headline}'#{@check}' on #{@entity_name}"
-          @subject += " is #{@state.upcase}" unless ['acknowledgement', 'test'].include?(@notification_type)
+          begin
+            @logger.debug "Woo, got a notification to send out: #{notification.inspect}"
+
+            @notification_type   = notification['notification_type']
+            @contact_first_name  = notification['contact_first_name']
+            @contact_last_name   = notification['contact_last_name']
+            @state               = notification['state']
+            @summary             = notification['summary']
+            @last_state          = notification['last_state']
+            @last_summary        = notification['last_summary']
+            @details             = notification['details']
+            @time                = notification['time']
+            @entity_name, @check = notification['event_id'].split(':', 2)
+
+            entity_check = Flapjack::Data::EntityCheck.for_event_id(notification['event_id'],
+              :redis => ::Resque.redis)
+
+            @in_unscheduled_maintenance = entity_check.in_scheduled_maintenance?
+            @in_scheduled_maintenance   = entity_check.in_unscheduled_maintenance?
+
+            # FIXME: I can not get the entity_check.last_change to work in this context (Resque)
+            # it always returns nil, despite entity_check being a good looking EntityCheck object
+            # and all ...
+            if lc = entity_check.last_change
+              duration  = (Time.now.to_i - lc)
+              @duration = (duration && duration > 40) ? duration : nil
+            end
+
+            headline_map = {'problem'         => 'Problem: ',
+                            'recovery'        => 'Recovery: ',
+                            'acknowledgement' => 'Acknowledgement: ',
+                            'test'            => 'Test Notification: ',
+                            'unknown'         => ''
+                           }
+
+            headline = headline_map[@notification_type] || ''
+
+            @subject = "#{headline}'#{@check}' on #{@entity_name}"
+            @subject += " is #{@state.upcase}" unless ['acknowledgement', 'test'].include?(@notification_type)
+          rescue => e
+            @logger.error "Error preparing email to #{m_to}: #{e.class}: #{e.message}"
+            @logger.error e.backtrace.join("\n")
+            raise
+          end
 
           begin
             host = @smtp_config ? @smtp_config['host'] : nil
             port = @smtp_config ? @smtp_config['port'] : nil
+            starttls = @smtp_config ? !! @smtp_config['starttls'] : nil
+            if @smtp_config
+              if auth_config = @smtp_config['auth']
+                auth = {}
+                auth[:type]     = auth_config['type'].to_sym || :plain
+                auth[:username] = auth_config['username']
+                auth[:password] = auth_config['password']
+              end
+            end
 
-            fqdn       = `/bin/hostname -f`.chomp
-            m_from     = "flapjack@#{fqdn}"
+            fqdn = `/bin/hostname -f`.chomp
+            m_from = "flapjack@#{fqdn}"
             @logger.debug("flapjack_mailer: set from to #{m_from}")
             m_reply_to = m_from
             m_to       = notification['address']
 
-          @logger.debug("sending Flapjack::Notification::Email " +
-            "#{notification['id']} to: #{m_to} subject: #{@subject}")
+            @logger.debug("sending Flapjack::Notification::Email " +
+              "#{notification['id']} to: #{m_to} subject: #{@subject}")
 
-            mail = prepare_email(:subject  => @subject,
-                    :from => m_from, :to => m_to)
+            mail = prepare_email(:subject => @subject,
+                                 :from    => m_from,
+                                 :to => m_to)
 
-            email = EM::P::SmtpClient.send(
-              :from     => m_from,
-              :to       => m_to,
-              :content  => "#{mail.to_s}\r\n.\r\n",
-              :domain   => fqdn,
-              :host     => host || 'localhost',
-              :port     => port || 25)
+            smtp_args = {:from     => m_from,
+                         :to       => m_to,
+                         :content  => "#{mail.to_s}\r\n.\r\n",
+                         :domain   => fqdn,
+                         :host     => host || 'localhost',
+                         :port     => port || 25,
+                         :starttls => starttls}
+            smtp_args.merge!(:auth => auth) if auth
+            email = EM::P::SmtpClient.send(smtp_args)
 
             response = EM::Synchrony.sync(email)
 
@@ -97,9 +123,10 @@ module Flapjack
 
             @logger.info "Email response: #{response.inspect}"
 
-          rescue Exception => e
-            @logger.error "Error delivering email to #{m_to}: #{e.message}"
+          rescue => e
+            @logger.error "Error delivering email to #{m_to}: #{e.class}: #{e.message}"
             @logger.error e.backtrace.join("\n")
+            raise
           end
         end
 

data/lib/flapjack/gateways/email/alert.html.erb

@@ -44,10 +44,19 @@
       </tr>
     <% end %>
 
-    <tr>
-      <td>Time</td>
-      <td><%= Time.at(@time.to_i).to_s %> (<%= @relative %> ago)</td>
-    </tr>
+    <% if @time %>
+      <tr>
+        <td>Time</td>
+        <td><%= Time.at(@time.to_i).to_s %></td>
+      </tr>
+    <% end %>
+
+    <% if @duration %>
+      <tr>
+        <td>Duration</td>
+        <td><%= ChronicDuration.output(@duration) %></td>
+      </tr>
+    <% end %>
 
     <% if @last_state %>
       <tr>

data/lib/flapjack/gateways/email/alert.text.erb

@@ -1,4 +1,4 @@
-Hi <%= @contact_first_name %>,
+Hi <%= @contact_first_name %>
 
 Monitoring has detected the following:
 
@@ -6,7 +6,7 @@ Entity:  <%= @entity_name %>
 Check:   <%= @check %>
 State:   <%= @state %>
 Summary: <%= @summary %>
-Time:    <%= Time.at(@time.to_i).to_s %> (<%= @relative %> ago)
+<%= @time ? "Time:    #{Time.at(@time.to_i).to_s}" : '' %>
 <%= @last_state ? "\nPrevious state: #{@last_state}" : '' %><%= @last_summary ? "\nPrevious summary: #{@last_summary}" : '' %>
 
 Cheers,

data/lib/flapjack/gateways/jabber.rb

@@ -1,14 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'socket'
+require 'em-hiredis'
 
-require 'eventmachine'
-# the redis/synchrony gems need to be required in this particular order, see
-# the redis-rb README for details
-require 'hiredis'
-require 'em-synchrony'
-require 'redis/connection/synchrony'
-require 'redis'
+require 'socket'
 
 require 'blather/client/client'
 require 'chronic_duration'
@@ -49,10 +43,10 @@ module Flapjack
 
       def initialize(opts = {})
         @config = opts[:config]
-        @redis_config = opts[:redis_config]
+        @redis_config = opts[:redis_config] || {}
         @boot_time = opts[:boot_time]
 
-        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 2) # first will block
+        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 2)
 
         @logger = opts[:logger]
 
@@ -63,7 +57,10 @@ module Flapjack
 
       def stop
         @should_quit = true
-        @redis.rpush(@config['queue'], Oj.dump('notification_type' => 'shutdown'))
+        redis_uri = @redis_config[:path] ||
+          "redis://#{@redis_config[:host] || '127.0.0.1'}:#{@redis_config[:port] || '6379'}/#{@redis_config[:db] || '0'}"
+        shutdown_redis = EM::Hiredis.connect(redis_uri)
+        shutdown_redis.rpush(@config['queue'], Oj.dump('notification_type' => 'shutdown'))
       end
 
       def setup
@@ -406,11 +403,19 @@ module Flapjack
         @logger.info("starting")
         @logger.debug("new jabber pikelet with the following options: #{@config.inspect}")
 
-        keepalive_timer = EM::Synchrony.add_periodic_timer(60) do
-          @logger.debug("calling keepalive on the jabber connection")
-          if connected?
-            EventMachine::Synchrony.next_tick do
-              write(' ')
+        # the periodic timer can't be halted early (without doing EM.stop) so
+        # keep the time short and count the iterations ... could just use
+        # EM.sleep(1) in a loop, I suppose
+        ki = 0
+        keepalive_timer = EventMachine::Synchrony.add_periodic_timer(1) do
+          ki += 1
+          if ki == 60
+            ki = 0
+            @logger.debug("calling keepalive on the jabber connection")
+            if connected?
+              EventMachine::Synchrony.next_tick do
+                write(' ')
+              end
             end
           end
         end
@@ -435,6 +440,7 @@ module Flapjack
             @logger.debug('jabber notification event received')
             @logger.debug(event.inspect)
             if 'shutdown'.eql?(type)
+              @logger.debug("@should_quit: #{@should_quit}")
               if @should_quit
                 EventMachine::Synchrony.next_tick do
                   # get delays without the next_tick

data/lib/flapjack/gateways/pagerduty.rb

@@ -20,8 +20,8 @@ module Flapjack
       def initialize(opts = {})
         @config = opts[:config]
         @logger = opts[:logger]
-        @redis_config = opts[:redis_config]
-        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 2) # first will block
+        @redis_config = opts[:redis_config] || {}
+        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 2)
 
         @logger.debug("New Pagerduty pikelet with the following options: #{@config.inspect}")
 
@@ -32,7 +32,11 @@ module Flapjack
       def stop
         @logger.info("stopping")
         @should_quit = true
-        @redis.rpush(@config['queue'], Oj.dump('notification_type' => 'shutdown'))
+
+        redis_uri = @redis_config[:path] ||
+          "redis://#{@redis_config[:host] || '127.0.0.1'}:#{@redis_config[:port] || '6379'}/#{@redis_config[:db] || '0'}"
+        shutdown_redis = EM::Hiredis.connect(redis_uri)
+        shutdown_redis.rpush(@config['queue'], Oj.dump('notification_type' => 'shutdown'))
       end
 
       def start