flapjack 1.6.0 → 2.0.0b1

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

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

data/lib/flapjack/gateways/slack/rollup.text.erb

@@ -1,2 +1,2 @@
 <%= @alert.type_sentence_case %>: <%= @alert.rollup_states_summary -%>
- (<%= @alert.rollup_states_detail_text(:max_checks_per_state => 3) -%>)
+ (<%= @alert.rollup_states_detail_text(:max_checks_per_state => 3) -%>)

data/lib/flapjack/gateways/sms_aspsms.rb

@@ -0,0 +1,155 @@
+#!/usr/bin/env ruby
+
+require 'net/http'
+require 'uri'
+require 'uri/https'
+
+require 'active_support/inflector'
+
+require 'flapjack/redis_proxy'
+require 'flapjack/record_queue'
+require 'flapjack/utility'
+require 'flapjack/exceptions'
+
+require 'flapjack/data/alert'
+require 'flapjack/data/check'
+
+module Flapjack
+  module Gateways
+    class SmsAspsms
+
+      ASPSMS_DEFAULT_HOST = 'webservice.aspsms.com'
+      ASPSMS_DEFAULT_PATH = '/aspsmsx.asmx/SimpleTextSMS'
+      ASPSMS_DEFAULT_ORIGINATOR = 'Flapjack'
+
+      attr_accessor :sent
+
+      include Flapjack::Utility
+
+      def initialize(opts = {})
+        @lock = opts[:lock]
+
+        @config = opts[:config]
+
+        # TODO support for config reloading
+        @queue = Flapjack::RecordQueue.new(@config['queue'] || 'sms_aspsms_notifications',
+                                           Flapjack::Data::Alert)
+
+        @sent = 0
+
+        Flapjack.logger.debug("new sms aspsms gateway pikelet with the following options: #{@config.inspect}")
+      end
+
+      def start
+        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 stop_type
+        :exception
+      end
+
+      private
+
+      def handle_alert(alert)
+        endpoint_host = @config["endpoint_host"] || ASPSMS_DEFAULT_HOST
+        endpoint_path = @config["endpoint_path"] || ASPSMS_DEFAULT_PATH
+        originator = @config["originator"] || ASPSMS_DEFAULT_ORIGINATOR
+        username = @config["username"]
+        password = @config["password"]
+
+        address = alert.medium.address
+        notification_id = alert.id
+        message_type = alert.rollup ? 'rollup' : 'alert'
+
+        sms_dir = File.join(File.dirname(__FILE__), 'sms_aspsms')
+        sms_template_erb, sms_template =
+            load_template(@config['templates'], message_type, 'text', sms_dir)
+
+        @alert = alert
+        bnd = binding
+
+        begin
+          message = sms_template_erb.result(bnd).chomp
+        rescue => e
+          Flapjack.logger.error "Error while executing the ERB for an sms: " +
+                                    "ERB being executed: #{sms_template}"
+          raise
+        end
+
+        if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
+          Flapjack.logger.error "Aspsms config is missing"
+          return
+        end
+
+        errors = []
+
+        safe_message = truncate(message, 156)
+
+        [[username, "Aspsms username is missing"],
+         [password, "Aspsms password is missing"],
+         [address, "SMS address is missing"],
+         [notification_id, "Notification id is missing"]].each do |val_err|
+
+          next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
+          errors << val_err.last
+        end
+
+        unless errors.empty?
+          errors.each {|err| Flapjack.logger.error err }
+          return
+        end
+
+        query = {'UserKey'     => username,
+                 'Password' => password,
+                 'Recipient' => address,
+                 'Originator' => originator,
+                 'MessageText' => safe_message}
+
+        # TODO ensure we're not getting a cached response from a proxy or similar,
+        # use appropriate headers etc.
+        uri = URI::HTTPS.build(:host => endpoint_host,
+                               :path => endpoint_path,
+                               :port => 443,
+                               :query => URI.encode_www_form(query))
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        request = Net::HTTP::Get.new(uri.request_uri)
+
+        http_response = http.request(request)
+
+        Flapjack.logger.debug "server response: #{http_response.inspect}"
+
+        status = http_response.code
+
+        if (status.to_i >= 200) && (status.to_i <= 206)
+          @sent += 1
+          Flapjack.logger.info "Sent SMS via Aspsms, response status is #{status}, " +
+                                   "alert id: #{alert.id}"
+        else
+          Flapjack.logger.error "Failed to send SMS via Aspsms, response status is #{status}, " +
+                                    "alert id: #{alert.id}"
+        end
+      rescue => e
+        Flapjack.logger.error "Error generating or delivering sms to #{alert.medium.address}: #{e.class}: #{e.message}"
+        Flapjack.logger.error e.backtrace.join("\n")
+        raise
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,7 @@
+<% check = @alert.check -%>
+<% summary = @alert.summary -%>
+<%= @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/sms_aspsms/rollup.text.erb

@@ -0,0 +1,2 @@
+<%= @alert.type_sentence_case %>: <%= @alert.rollup_states_summary -%>
+ (<%= @alert.rollup_states_detail_text(:max_checks_per_state => 3) -%>)

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -1,95 +1,103 @@
 #!/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
     class SmsMessagenet
 
-      MESSAGENET_DEFAULT_URL = 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
+      MESSAGENET_DEFAULT_HOST = 'www.messagenet.com.au'
+      MESSAGENET_DEFAULT_PATH = '/dotnet/Lodge.asmx/LodgeSMSMessage'
+
+      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 sms_messagenet gateway pikelet with the following options: #{@config.inspect}")
+        # TODO support for config reloading
+        @queue = Flapjack::RecordQueue.new(@config['queue'] || 'sms_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 sms gateway pikelet with the following options: #{@config.inspect}")
       end
 
       def start
-        queue = @config['queue']
-
-        until @should_quit
-          begin
-            @logger.debug("sms_messagenet 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 SMS Messagenet 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)
-        endpoint = @config["endpoint"] || MESSAGENET_DEFAULT_URL
+      def stop_type
+        :exception
+      end
+
+      private
+
+      def handle_alert(alert)
+        endpoint_host = @config["endpoint_host"] || MESSAGENET_DEFAULT_HOST
+        endpoint_path = @config["endpoint_path"] || MESSAGENET_DEFAULT_PATH
         username = @config["username"]
         password = @config["password"]
 
-        address         = alert.address
-        notification_id = alert.notification_id
-        message_type    = alert.rollup ? 'rollup' : 'alert'
+        address = alert.medium.address
+        notification_id = alert.id
+        message_type = alert.rollup ? 'rollup' : 'alert'
 
+        sms_dir = File.join(File.dirname(__FILE__), 'sms_messagenet')
         sms_template_erb, sms_template =
-          load_template(@config['templates'], message_type, 'text',
-                        File.join(File.dirname(__FILE__), 'sms_messagenet'))
+          load_template(@config['templates'], message_type, 'text', sms_dir)
 
-        @alert  = alert
-        bnd     = binding
+        @alert = alert
+        bnd = binding
 
         begin
           message = sms_template_erb.result(bnd).chomp
         rescue => e
-          @logger.error "Error while executing the ERB for an sms: " +
+          Flapjack.logger.error "Error while executing the ERB for an sms: " +
             "ERB being executed: #{sms_template}"
           raise
         end
 
         if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
-          @logger.error "Messagenet config is missing"
+          Flapjack.logger.error "Messagenet config is missing"
           return
         end
 
         errors = []
 
-        safe_message = truncate(message, 159)
+        safe_message = truncate(message, 156)
 
         [[username, "Messagenet username is missing"],
          [password, "Messagenet password is missing"],
-         [address,  "SMS address is missing"],
+         [address, "SMS address is missing"],
          [notification_id, "Notification id is missing"]].each do |val_err|
 
           next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
@@ -97,32 +105,44 @@ module Flapjack
         end
 
         unless errors.empty?
-          errors.each {|err| @logger.error err }
+          errors.each {|err| Flapjack.logger.error err }
           return
         end
 
-        query = {'Username'     => username,
-                 'Pwd'          => password,
-                 'PhoneNumber'  => address,
+        query = {'Username' => username,
+                 'Pwd' => password,
+                 'PhoneNumber' => address,
                  'PhoneMessage' => safe_message}
 
-        http = EM::HttpRequest.new(endpoint).get(:query => query)
+        # TODO ensure we're not getting a cached response from a proxy or similar,
+        # use appropriate headers etc.
+        uri = URI::HTTPS.build(:host => endpoint_host,
+                               :path => endpoint_path,
+                               :port => 443,
+                               :query => URI.encode_www_form(query))
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        request = Net::HTTP::Get.new(uri.request_uri)
+
+        http_response = http.request(request)
+
+        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 SMS via Messagenet, response status is #{status}, " +
-            "notification_id: #{notification_id}"
+          Flapjack.logger.info "Sent SMS via Messagenet, response status is #{status}, " +
+            "alert id: #{alert.id}"
         else
-          @logger.error "Failed to send SMS via Messagenet, response status is #{status}, " +
-            "notification_id: #{notification_id}"
+          Flapjack.logger.error "Failed to send SMS via Messagenet, response status is #{status}, " +
+            "alert id: #{alert.id}"
         end
       rescue => e
-        @logger.error "Error generating or delivering sms to #{alert.address}: #{e.class}: #{e.message}"
-        @logger.error e.backtrace.join("\n")
+        Flapjack.logger.error "Error generating or delivering sms to #{alert.medium.address}: #{e.class}: #{e.message}"
+        Flapjack.logger.error e.backtrace.join("\n")
         raise
       end
 

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

@@ -1,6 +1,7 @@
+<% check = @alert.check -%>
 <% 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/sms_nexmo.rb

@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
 
-require 'em-synchrony'
-require 'em-synchrony/em-http'
-require 'active_support/inflector'
+require 'erb'
 
-require 'flapjack/redis_pool'
+require 'nexmo'
 
-require 'flapjack/data/alert'
+require 'flapjack/redis_proxy'
+require 'flapjack/record_queue'
 require 'flapjack/utility'
+require 'flapjack/exceptions'
 
-require 'nexmo'
+require 'flapjack/data/alert'
 
 module Flapjack
   module Gateways
@@ -17,103 +17,105 @@ 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 sms_nexmo gateway pikelet with the following options: #{@config.inspect}")
+        # TODO support for config reloading
+        @queue = Flapjack::RecordQueue.new(@config['queue'] || 'sms_nexmo_notifications',
+                   Flapjack::Data::Alert)
 
         @sent = 0
       end
 
-      def stop
-        @logger.info("stopping")
-        @should_quit = true
+      def start
+        Flapjack.logger.debug("new sms_nexmo gateway pikelet with the following options: #{@config.inspect}")
 
-        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'))
-      end
+        begin
+          Zermelo.redis = Flapjack.redis
 
-      def start
-        queue = @config['queue']
-
-        until @should_quit
-          begin
-            @logger.debug("sms_nexmo 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 SMS Nexmo message: #{e.class}: #{e.message}\n" +
-              e.backtrace.join("\n")
+          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 "Woo, got an alert to send out: #{alert.inspect}"
+
         api_key = @config["api_key"]
         secret = @config["secret"]
         from = @config["from"]
 
-        address         = alert.address
-        notification_id = alert.notification_id
+        address = alert.medium.address
         message_type    = alert.rollup ? 'rollup' : 'alert'
 
-        sms_template_erb, sms_template =
-          load_template(@config['templates'], message_type, 'text',
-                        File.join(File.dirname(__FILE__), 'sms_nexmo'))
+        sms_dir = File.join(File.dirname(__FILE__), 'sms_nexmo')
+        sms_nexmo_template_erb, sms_nexmo_template =
+          load_template(@config['templates'], message_type, 'text', sms_dir)
 
         @alert  = alert
         bnd     = binding
 
         begin
-          message = sms_template_erb.result(bnd).chomp
+          message = sms_nexmo_template_erb.result(bnd).chomp
         rescue => e
-          @logger.error "Error while executing the ERB for an sms: " +
-            "ERB being executed: #{sms_template}"
+          Flapjack.logger.error "Error while executing the ERB for a Nexmo SMS: " +
+            "ERB being executed: #{sms_nexmo_template}"
           raise
         end
 
         if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
-          @logger.error "Messagenet config is missing"
+          Flapjack.logger.error "Nexmo SMS config is missing"
           return
         end
 
         errors = []
 
-        safe_message = truncate(message, 159)
+        safe_message = (message.length > 159) ?
+                        message[0..158].gsub(/...$/, '...') : message,
 
         [[api_key, "Nexmo api_key is missing"],
-         [secret, "Twilio auth_token is missing"],
-         [from,  "SMS from address is missing"],
-         [address,  "SMS address is missing"],
-         [notification_id, "Notification id is missing"]].each do |val_err|
+         [secret, "Nexmo auth_token is missing"],
+         [from,  "Nexmo from address is missing"],
+         [address,  "Nexmo address is missing"]].each do |val_err|
 
           next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
           errors << val_err.last
         end
 
         unless errors.empty?
-          errors.each {|err| @logger.error err }
+          errors.each {|err| Flapjack.logger.error err }
           return
         end
 
         begin
-          nexmo = Nexmo::Client.new(key: api_key, secret: secret)
-          nexmo.send_message(from: from, to: address, text: safe_message)
+          nexmo = Nexmo::Client.new(:key => api_key, :secret => secret)
+          nexmo.send_message(:from => from, :to => address, :text => safe_message)
           @sent += 1
         rescue => e
-          @logger.error "Error sending SMS via Nexmo: #{e.message}"
+          Flapjack.logger.error "Error sending SMS via Nexmo: #{e.message}"
         end
       rescue => e
-        @logger.error "Error generating or delivering sms to #{alert.address}: #{e.class}: #{e.message}"
-        @logger.error e.backtrace.join("\n")
+        Flapjack.logger.error "Error generating or delivering Nexmo SMS message to #{alert.medium.address}: #{e.class}: #{e.message}"
+        Flapjack.logger.error e.backtrace.join("\n")
         raise
       end
+
     end
   end
 end