flapjack 1.6.0 → 2.0.0b1

data/lib/flapjack/filters/unscheduled_maintenance.rb

@@ -7,11 +7,20 @@ module Flapjack
     class UnscheduledMaintenance
       include Base
 
-      def block?(event, entity_check, previous_state)
-        result = entity_check.in_unscheduled_maintenance? && !event.acknowledgement?
-        @logger.debug("Filter: Unscheduled Maintenance: #{result ? "block" : "pass"}")
+      def block?(check, opts = {})
+        new_state = opts[:new_state]
+
+        result = check.in_unscheduled_maintenance? &&
+          !('acknowledgement'.eql?(new_state.action) ||
+            Flapjack::Data::Condition.healthy?(new_state.condition))
+
+        Flapjack.logger.debug {
+          "Filter: Unscheduled Maintenance: #{result ? "block" : "pass"}"
+        }
+
         result
       end
+
     end
   end
 end

data/lib/flapjack/gateways/aws_sns.rb

@@ -1,13 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'em-synchrony'
-require 'em-synchrony/em-http'
+require 'net/http'
+require 'uri'
+require 'uri/https'
+
 require 'active_support/inflector'
 
-require 'flapjack/redis_pool'
+require 'flapjack/redis_proxy'
+require 'flapjack/record_queue'
+require 'flapjack/utility'
+require 'flapjack/exceptions'
 
 require 'flapjack/data/alert'
-require 'flapjack/utility'
+require 'flapjack/data/check'
 
 module Flapjack
   module Gateways
@@ -15,46 +20,49 @@ module Flapjack
 
       SNS_DEFAULT_REGION_NAME = 'us-east-1'
 
+      attr_accessor :sent
+
       include Flapjack::Utility
 
       def initialize(opts = {})
+        @lock = opts[:lock]
+
         @config = opts[:config]
-        @logger = opts[:logger]
-        @redis_config = opts[:redis_config] || {}
-        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 1, :logger => @logger)
 
-        @logger.info("starting")
-        @logger.debug("new aws_sns gateway pikelet with the following options: #{@config.inspect}")
+        # TODO support for config reloading
+        @queue = Flapjack::RecordQueue.new(@config['queue'] || 'sns_notifications',
+                   Flapjack::Data::Alert)
 
         @sent = 0
-      end
-
-      def stop
-        @logger.info("stopping")
-        @should_quit = true
 
-        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'], Flapjack.dump_json('notification_type' => 'shutdown'))
+        Flapjack.logger.debug("new sns gateway pikelet with the following options: #{@config.inspect}")
       end
 
       def start
-        queue = @config['queue']
-
-        until @should_quit
-          begin
-            @logger.debug("aws_sns gateway is going into blpop mode on #{queue}")
-            alert = Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger)
-            deliver(alert) unless alert.nil?
-          rescue => e
-            @logger.error "Error generating or dispatching AWS SNS message: #{e.class}: #{e.message}\n" +
-              e.backtrace.join("\n")
+        begin
+          Zermelo.redis = Flapjack.redis
+
+          loop do
+            @lock.synchronize do
+              @queue.foreach {|alert| handle_alert(alert) }
+            end
+
+            @queue.wait
           end
+        ensure
+          Flapjack.redis.quit
         end
       end
 
-      def deliver(alert)
+      def stop_type
+        :exception
+      end
+
+      private
+
+      def handle_alert(alert)
+        Flapjack.logger.debug "Received a notification: #{alert.inspect}"
+
         region_name = @config["region_name"] || SNS_DEFAULT_REGION_NAME
         hostname = "sns.#{region_name}.amazonaws.com"
         endpoint = "http://#{hostname}/"
@@ -62,8 +70,8 @@ module Flapjack
         secret_key = @config["secret_key"]
         timestamp = Time.at(alert.time).utc.strftime('%Y-%m-%dT%H:%M:%SZ')
 
-        address         = alert.address
-        notification_id = alert.notification_id
+        address         = alert.medium.address
+        notification_id = alert.id
         message_type    = alert.rollup ? 'rollup' : 'alert'
 
         aws_sns_subject_template_erb, aws_sns_subject_template =
@@ -75,6 +83,7 @@ module Flapjack
                         File.join(File.dirname(__FILE__), 'aws_sns'))
 
         @alert  = alert
+        @check  = alert.check
         bnd     = binding
 
         begin
@@ -84,13 +93,13 @@ module Flapjack
           erb_to_be_executed = aws_sns_template
           message = aws_sns_template_erb.result(bnd).chomp
         rescue => e
-          @logger.error "Error while executing the ERB for an AWS SNS message: " +
+          Flapjack.logger.error "Error while executing the ERB for an AWS SNS message: " +
             "ERB being executed: #{erb_to_be_executed}"
           raise
         end
 
         if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
-          @logger.error "AWS SNS config is missing"
+          Flapjack.logger.error "AWS SNS config is missing"
           return
         end
 
@@ -106,7 +115,7 @@ module Flapjack
         end
 
         unless errors.empty?
-          errors.each {|err| @logger.error err }
+          errors.each {|err| Flapjack.logger.error err }
           return
         end
 
@@ -120,27 +129,35 @@ module Flapjack
                  'Timestamp'        => timestamp,
                  'AWSAccessKeyId'   => access_key.upcase}
 
-        string_to_sign = self.class.string_to_sign('POST', hostname, "/", query)
+        # TODO ensure we're not getting a cached response from a proxy or similar,
+        # use appropriate headers etc.
+        string_sign = self.class.string_to_sign('POST', hostname, "/", query)
+
+        query['Signature'] = self.class.get_signature(secret_key, string_sign)
 
-        query['Signature'] = self.class.get_signature(secret_key, string_to_sign)
+        req = Net::HTTP::Post.new(endpoint)
+        req.set_form_data(query)
 
-        http = EM::HttpRequest.new(endpoint).post(:query => query)
+        http_response = Net::HTTP.start(hostname) do |http|
+          http.request(req)
+        end
+
+        Flapjack.logger.debug "server response: #{http_response.inspect}"
 
-        @logger.debug "server response: #{http.response}"
+        status = http_response.code
 
-        status = (http.nil? || http.response_header.nil?) ? nil : http.response_header.status
-        if (status >= 200) && (status <= 206)
+        if (status.to_i >= 200) && (status.to_i <= 206)
           @sent += 1
-          alert.record_send_success!
-          @logger.debug "Sent notification via SNS, response status is #{status}, " +
+          Flapjack.logger.debug "Sent notification via SNS, response status is #{status}, " +
             "notification_id: #{notification_id}"
         else
-          @logger.error "Failed to send notification via SNS, response status is #{status}, " +
+          Flapjack.logger.error "Failed to send notification via SNS, response status is #{status}, " +
             "notification_id: #{notification_id}"
         end
+
       rescue => e
-        @logger.error "Error generating or delivering notification to #{address}: #{e.class}: #{e.message}"
-        @logger.error e.backtrace.join("\n")
+        Flapjack.logger.error "Error generating or delivering notification to #{address}: #{e.class}: #{e.message}"
+        Flapjack.logger.error e.backtrace.join("\n")
         raise
       end
 
@@ -151,10 +168,10 @@ module Flapjack
       end
 
       def self.string_to_sign(method, host, uri, query)
-        @safe_re ||= Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
-
         encoded_query = query.keys.sort.collect {|key|
-          "#{URI.escape(key, @safe_re)}=#{URI.escape(query[key].to_s, @safe_re)}"
+          k = URI.encode_www_form_component(key)
+          v = URI.encode_www_form_component(query[key].to_s)
+          "#{k}=#{v}"
         }.join("&")
 
         [method.upcase,
@@ -167,4 +184,3 @@ module Flapjack
     end
   end
 end
-

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

@@ -1,6 +1,6 @@
 <% summary = @alert.summary -%>
-<%= @alert.type_sentence_case %>: '<%= @alert.check %>' on <%= @alert.entity -%>
-<% unless ['acknowledgement', 'test'].include?(@alert.notification_type) -%>
+<%= @alert.type_sentence_case %>: <%= "'#{@check.name}'" -%>
+<% unless ['acknowledgement', 'test'].include?(@alert.type) -%>
  is <%= @alert.state_title_case -%>
 <% end -%>
  at <%= Time.at(@alert.time).strftime('%-d %b %H:%M') %><%= (summary.nil? || summary.empty?) ? '' : ", #{summary}" -%>

data/lib/flapjack/gateways/aws_sns/alert_subject.text.erb

@@ -1,4 +1,4 @@
-<%= @alert.type_sentence_case %>: '<%= @alert.check %>' on <%= @alert.entity -%>
+<%= @alert.type_sentence_case %>: '<%= @check.name %>' -%>
 <% unless ['acknowledgement', 'test'].include?(@alert.notification_type) -%>
  is <%= @alert.state_title_case -%>
-<% end -%>
+<% end -%>

data/lib/flapjack/gateways/aws_sns/rollup_subject.text.erb

@@ -1 +1 @@
-<%= @alert.type_sentence_case %>: <%= @alert.rollup_states_summary -%>
+<%= @alert.type_sentence_case %>: <%= @alert.rollup_states_summary -%>

data/lib/flapjack/gateways/email.rb

@@ -6,14 +6,14 @@ require 'socket'
 require 'chronic_duration'
 require 'active_support/inflector'
 
-require 'em-synchrony'
-require 'em/protocols/smtpclient'
-
-require 'flapjack/redis_pool'
+require 'flapjack/redis_proxy'
+require 'flapjack/record_queue'
 require 'flapjack/utility'
+require 'flapjack/exceptions'
 
-require 'flapjack/data/entity_check'
 require 'flapjack/data/alert'
+require 'flapjack/data/check'
+require 'flapjack/data/contact'
 
 module Flapjack
   module Gateways
@@ -22,112 +22,130 @@ module Flapjack
 
       include Flapjack::Utility
 
+      attr_accessor :sent
+
       def initialize(opts = {})
+        @lock = opts[:lock]
         @config = opts[:config]
-        @logger = opts[:logger]
-        @redis_config = opts[:redis_config] || {}
-        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 1, :logger => @logger)
 
-        @logger.info("starting")
-        @logger.debug("new email gateway pikelet with the following options: #{@config.inspect}")
-        @smtp_config = @config.delete('smtp_config')
-        @sent = 0
-        @fqdn = `/bin/hostname -f`.chomp
-      end
+        # TODO support for config reloading
+        @queue = Flapjack::RecordQueue.new(@config['queue'] || 'email_notifications',
+                   Flapjack::Data::Alert)
 
-      def stop
-        @logger.info("stopping")
-        @should_quit = true
+        if @smtp_config = @config['smtp_config']
+          @host = @smtp_config['host'] || 'localhost'
+          @port = @smtp_config['port'] || 25
 
-        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'], Flapjack.dump_json('notification_type' => 'shutdown'))
+          # NB: needs testing
+          if @smtp_config['authentication'] && @smtp_config['username'] &&
+            @smtp_config['password']
+
+            @auth = {:authentication => @smtp_config['authentication'],
+                     :username => @smtp_config['username'],
+                     :password => @smtp_config['password'],
+                     :enable_starttls_auto => true
+                    }
+          end
+
+        else
+          @host = 'localhost'
+          @port = 25
+        end
+
+        @fqdn = `/bin/hostname -f`.chomp
+        @sent = 0
       end
 
       def start
-        queue = @config['queue']
-
-        until @should_quit
-          begin
-            @logger.debug("email gateway is going into blpop mode on #{queue}")
-            alert = Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger)
-            deliver(alert) unless alert.nil?
-          rescue => e
-            @logger.error "Error generating or dispatching email message: #{e.class}: #{e.message}\n" +
-              e.backtrace.join("\n")
+        Flapjack.logger.debug("new email gateway pikelet with the following options: #{@config.inspect}")
+
+        begin
+          Zermelo.redis = Flapjack.redis
+
+          loop do
+            @lock.synchronize do
+              @queue.foreach {|alert| handle_alert(alert) }
+            end
+
+            @queue.wait
           end
+        ensure
+          Flapjack.redis.quit
         end
       end
 
-      def deliver(alert)
-        host = @smtp_config ? @smtp_config['host'] : nil
-        port = @smtp_config ? @smtp_config['port'] : nil
-        starttls = @smtp_config ? !! @smtp_config['starttls'] : nil
-        m_from = @smtp_config ? @smtp_config['from'] : "flapjack@#{@fqdn}"
-        m_reply_to = @smtp_config ? ( @smtp_config['reply_to'] ||= m_from ) : "flapjack@#{@fqdn}"
+      def stop_type
+        :exception
+      end
+
+      private
+
+      def safe_address(addr)
+        return "flapjack@#{@fqdn}" if addr.nil? || addr.empty?
+        safe_addr = addr.clone
+        while safe_addr =~ /(<|>)/
+          safe_addr.sub!(/^.*</, '').sub!(/>.*$/, '')
+        end
+
+        safe_addr
+      end
+
+      def handle_alert(alert)
+        Flapjack.logger.debug "Woo, got an alert to send out: #{alert.inspect}"
         if @smtp_config
+          host = @smtp_config['host']
+          port = @smtp_config['port']
+          starttls = !!@smtp_config['starttls']
+
+          m_from = safe_address(@smtp_config['from'])
+          m_reply_to = @smtp_config['reply_to'] || @smtp_config['from']
+
           if auth_config = @smtp_config['auth']
             auth = {}
-            auth[:type]     = auth_config['type'].to_sym || :plain
+            auth[:type] = auth_config['type'].to_sym || :plain
             auth[:username] = auth_config['username']
             auth[:password] = auth_config['password']
           end
+        else
+          host = nil
+          port = nil
+          starttls = nil
+          m_reply_to = m_from = "flapjack@#{@fqdn}"
         end
 
-        @logger.debug("flapjack_mailer: set from to #{m_from}")
-
-        mail = prepare_email(:from       => m_from,
-                             :reply_to   => m_reply_to,
-                             :to         => alert.address,
-                             :message_id => "<#{alert.notification_id}@#{@fqdn}>",
-                             :alert      => alert)
-
-        smtp_from = m_from.clone
-        while smtp_from =~ /(<|>)/
-          smtp_from.sub!(/^.*</, '')
-          smtp_from.sub!(/>.*$/, '')
-        end
-
-        smtp_args = {:from     => smtp_from,
-                     :to       => alert.address,
-                     :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)
+        Flapjack.logger.debug("flapjack_mailer: set from to #{m_from}")
 
-        response = EM::Synchrony.sync(email)
+        mail = prepare_email(:from => m_from,
+                             :reply_to => m_reply_to,
+                             :to => alert.medium.address,
+                             :message_id => "<#{alert.id}@#{@fqdn}>",
+                             :alert => alert)
 
-        # http://tools.ietf.org/html/rfc821#page-36 SMTP response codes
-        if response && response.respond_to?(:code) &&
-          ((response.code == 250) || (response.code == 251))
-          alert.record_send_success!
-          @sent += 1
-        else
-          @logger.error "Email sending failed"
+        # TODO a cleaner way to not step on test delivery settings
+        # (don't want to stub in Cucumber)
+        unless defined?(FLAPJACK_ENV) && 'test'.eql?(FLAPJACK_ENV)
+          mail.delivery_method(:smtp, {:address => @host,
+                                       :port => @port}.merge(@auth || {}))
         end
 
-        @logger.debug "Email response: #{response.inspect}"
+        # any exceptions will be propagated through to main pikelet handler
+        mail.deliver
 
+        Flapjack.logger.info "Email sending succeeded"
+        @sent += 1
       rescue => e
-        @logger.error "Error generating or delivering email to #{alert.address}: #{e.class}: #{e.message}"
-        @logger.error e.backtrace.join("\n")
+        Flapjack.logger.error "Error generating or delivering email to #{alert.medium.address}: #{e.class}: #{e.message}"
+        Flapjack.logger.error e.backtrace.join("\n")
         raise
       end
 
-      private
-
       # returns a Mail object
       def prepare_email(opts = {})
-        from       = opts[:from]
-        reply_to   = opts[:reply_to]
-        to         = opts[:to]
+        from = opts[:from]
+        to = opts[:to]
+        reply_to = opts[:reply_to]
         message_id = opts[:message_id]
-        alert      = opts[:alert]
+        alert = opts[:alert]
 
         message_type = alert.rollup ? 'rollup' : 'alert'
 
@@ -143,8 +161,8 @@ module Flapjack
           load_template(@config['templates'], message_type,
                         'html', File.join(File.dirname(__FILE__), 'email'))
 
-        @alert  = alert
-        bnd     = binding
+        @alert = alert
+        bnd = binding
 
         # do some intelligence gathering in case an ERB execution blows up
         begin
@@ -156,19 +174,19 @@ module Flapjack
 
           erb_to_be_executed = html_template
           body_html = html_template_erb.result(bnd)
-        rescue => e
-          @logger.error "Error while executing ERBs for an email: " +
+        rescue
+          Flapjack.logger.error "Error while executing ERBs for an email: " +
             "ERB being executed: #{erb_to_be_executed}"
           raise
         end
 
-        @logger.debug("preparing email to: #{to}, subject: #{subject}, message-id: #{message_id}")
+        Flapjack.logger.debug("preparing email to: #{to}, subject: #{subject}, message-id: #{message_id}")
 
-        mail = Mail.new do
-          from       from
-          to         to
-          subject    subject
-          reply_to   reply_to
+        Mail.new do
+          from from
+          to to
+          subject subject
+          reply_to reply_to
           message_id message_id
 
           text_part do
@@ -180,7 +198,6 @@ module Flapjack
             body body_html
           end
         end
-
       end
     end
   end