flapjack 1.2.2 → 1.3.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08eb6e473cdb410cd9628953cee45bd15105e730
-  data.tar.gz: e70c64ec5ee5fbaebcd0a57ea28279637baa9ae8
+  metadata.gz: 185fa9c36254b3a0b485d15b0e68dbf2dc78293f
+  data.tar.gz: 3d1498ef293b573d05c220d937669eb86e27c397
 SHA512:
-  metadata.gz: ba9fe3aab9ae6f58038f663737a478991bfc378a263f1e83919ff608f6bcc5b44883a71f36f9568ec38a53f8273df044802034d2ca6540be70d5930aabb3ba07
-  data.tar.gz: e95391893e56e8b8fe95c46db61777b861e6b470889d61e578ffd3a856a6da39c95626c6f58519145768346795f57c859d17bbc6bb234cdc91a5766b6a80470c
+  metadata.gz: d70b5835bddcd1fefd168214af474e0cd3dc415a771549cf2565d8f77bbf4818e7a4cd1e885e21f33148da686cc12d37481ae0bc2844d39b28cd66c20a1150fa
+  data.tar.gz: 5cba7f54a06919f5775cae0ab15db54158bbde4d8f21b343d8e204c10fc0a9d5c302423b492b36824d18913169613d691782ba663c9fc9351e1df84ce93884fb

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
 - '2.0'
 - '2.1'
 - '2.2'
+env:
+- GOPATH=$TRAVIS_BUILD_DIR
 services:
 - redis-server
 before_script:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 1.3.0rc1 - 2015-02-13
+- Feature: Add Nexmo SMS gateway
+- Bug: Revert addition of sms_gammu gateway #759 (@ali-graham)
+
 # 1.2.2 - 2015-02-10
 - Feature: Add the maint subcommand to the chat bot to fix #664 (@someword)
 - Feature: support for Ruby 2.2, drop support for 1.9, removes Resque due to gem dependencies #760 (@ali-graham)

data/etc/flapjack_config.yaml.example

@@ -39,8 +39,8 @@ production:
     queue: notifications
     email_queue: email_notifications
     sms_queue: sms_notifications
+    sms_nexmo_queue: sms_nexmo_notifications
     sms_twilio_queue: sms_twilio_notifications
-    sms_gammu_queue: sms_gammu_notifications
     sns_queue: sns_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
@@ -117,22 +117,20 @@ production:
       #templates:
       #  rollup.text: '/etc/flapjack/templates/sms_twilio/rollup.text.erb'
       #  alert.text: '/etc/flapjack/templates/sms_twilio/alert.text.erb'
-    # Sends SMS notifications via Gammu
-    sms_gammu:
+    # Sends SMS notifications via Nexmo
+    sms_nexmo:
       enabled: yes
-      queue: sms_gammu_notifications
+      queue: sms_nexmo_notifications
       from: "xxxxxxxxx"
-      mysql_host: "x.x.x.x"
-      mysql_database: "gammu"
-      mysql_username: "gammu"
-      mysql_password: "xxxxxxxx"
+      api_key: "APIKEY"
+      secret: "s3cr3t"
       logger:
         level: INFO
         syslog_errors: yes
       # location of custom alert templates
-      templates:
-        rollup.text: '/etc/flapjack/templates/sms_gammu/rollup.text.erb'
-        alert.text: '/etc/flapjack/templates/sms_gammu/alert.text.erb'
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/sms/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/sms/alert.text.erb'
     # Generates SNS notifications
     sns:
       enabled: no
@@ -272,6 +270,7 @@ development:
     queue: notifications
     email_queue: email_notifications
     sms_queue: sms_notifications
+    sms_nexmo_queue: sms_nexmo_notifications
     sms_twilio_queue: sms_twilio_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
@@ -348,7 +347,20 @@ development:
       #templates:
       #  rollup.text: '/etc/flapjack/templates/sms_twilio/rollup.text.erb'
       #  alert.text: '/etc/flapjack/templates/sms_twilio/alert.text.erb'
-    # Generates SNS notifications
+    # Sends SMS notifications via Nexmo
+    sms_nexmo:
+      enabled: no
+      queue: sms_nexmo_notifications
+      from: "xxxxxxxxx"
+      api_key: "APIKEY"
+      secret: "s3cr3t"
+      logger:
+        level: INFO
+        syslog_errors: yes
+      # location of custom alert templates
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/sms/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/sms/alert.text.erb'
     # Connects to an XMPP (jabber) server, sends notifications (to rooms and individuals),
     # handles acknowledgements from jabber users and other commands.
     jabber:

data/features/notifications.feature

@@ -11,6 +11,13 @@ Feature: notifications
     Then an SMS notification for entity 'example.com' should be queued for the user
     And an email notification for entity 'example.com' should not be queued for the user
 
+  Scenario: Queue a Nexmo SMS notification
+    Given the user wants to receive Nexmo SMS notifications for entity 'example.com'
+    When an event notification is generated for entity 'example.com'
+    Then a Nexmo SMS notification for entity 'example.com' should be queued for the user
+    And an email notification for entity 'example.com' should not be queued for the user
+    And an SMS notification for entity 'example.com' should not be queued for the user
+
   Scenario: Queue an SNS notification
     Given the user wants to receive SNS notifications for entity 'example.com'
     When an event notification is generated for entity 'example.com'
@@ -37,6 +44,11 @@ Feature: notifications
     When the SMS notification handler runs successfully
     Then the user should receive an SMS notification
 
+  Scenario: Send a queued Nexmo SMS notification
+    Given a user Nexmo SMS notification has been queued for entity 'example.com'
+    When the Nexmo SMS notification handler runs successfully
+    Then the user should receive an Nexmo SMS notification
+
   Scenario: Send a queued SNS notification
     Given a user SNS notification has been queued for entity 'example.com'
     When the SNS notification handler runs successfully

data/features/steps/notifications_steps.rb

@@ -26,6 +26,18 @@ Given /^the user wants to receive SMS notifications for entity '([\w\.\-]+)'$/ d
                              :redis => @notifier_redis )
 end
 
+Given /^the user wants to receive Nexmo SMS notifications for entity '([\w\.\-]+)'$/ do |entity|
+  add_contact( 'id'         => '0999',
+               'first_name' => 'John',
+               'last_name'  => 'Smith',
+               'email'      => 'johns@example.dom',
+               'media'      => {'sms_nexmo' => '+61888888888'} )
+  Flapjack::Data::Entity.add({'id'       => '5000',
+                              'name'     => entity,
+                              'contacts' => ["0999"]},
+                             :redis => @notifier_redis )
+end
+
 Given /^the user wants to receive SNS notifications for entity '([\w\.\-]+)'$/ do |entity|
   add_contact( 'id'         => '0999',
                'first_name' => 'John',
@@ -99,6 +111,11 @@ Then /^an SMS notification for entity '([\w\.\-]+)' should be queued for the use
   expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
 end
 
+Then /^a Nexmo SMS notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
+  queue = redis_peek('sms_nexmo_notifications')
+  expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
+end
+
 Then /^an SNS notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
   queue = redis_peek('sns_notifications')
   expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
@@ -114,6 +131,11 @@ Then /^an SMS notification for entity '([\w\.\-]+)' should not be queued for the
   expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).to be_empty
 end
 
+Then /^an Nexmo SMS notification for entity '([\w\.\-]+)' should not be queued for the user$/ do |entity|
+  queue = redis_peek('sms_nexmo_notifications')
+  expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).to be_empty
+end
+
 Then /^an email notification for entity '([\w\.\-]+)' should not be queued for the user$/ do |entity|
   queue = redis_peek('email_notifications')
   expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).to be_empty
@@ -139,6 +161,26 @@ Given /^a user SMS notification has been queued for entity '([\w\.\-]+)'$/ do |e
                             :redis => @notifier_redis)
 end
 
+Given /^a user Nexmo SMS notification has been queued for entity '([\w\.\-]+)'$/ do |entity|
+  Flapjack::Data::Entity.add({'id'   => '5000',
+                              'name' => entity},
+                             :redis => @redis )
+  @sms_nexmo_notification = {'notification_type'  => 'problem',
+                       'contact_first_name' => 'John',
+                       'contact_last_name'  => 'Smith',
+                       'state'              => 'critical',
+                       'summary'            => 'Socket timeout after 10 seconds',
+                       'time'               => Time.now.to_i,
+                       'event_id'           => "#{entity}:ping",
+                       'address'            => '+61412345678',
+                       'id'                 => 1,
+                       'state_duration'     => 30,
+                       'duration'           => 45}
+
+  Flapjack::Data::Alert.add('sms_nexmo_notifications', @sms_nexmo_notification,
+                            :redis => @notifier_redis)
+end
+
 Given /^a user SNS notification has been queued for entity '([\w\.\-]+)'$/ do |entity|
   Flapjack::Data::Entity.add({'id'   => '5000',
                               'name' => entity},
@@ -189,6 +231,19 @@ When /^the SMS notification handler runs successfully$/ do
   drain_alerts('sms_notifications', @sms_messagenet)
 end
 
+When /^the Nexmo SMS notification handler runs successfully$/ do
+  # poor man's stubbing
+  Nexmo::Client.class_eval {
+    def send_message(args = {})
+    end
+  }
+  @sms_nexmo = Flapjack::Gateways::SmsNexmo.new(:config => {
+      'api_key' => 'THEAPIKEY', 'secret' => 'secret', 'from' => 'someone',
+    }, :redis_config => @redis_opts, :logger => @logger)
+
+  drain_alerts('sms_nexmo_notifications', @sms_nexmo)
+end
+
 When /^the SNS notification handler runs successfully$/ do
   @request = stub_request(:post, /amazonaws\.com/)
 
@@ -264,6 +319,10 @@ Then /^the user should( not)? receive an SMS notification$/ do |negativity|
   expect(@sms_messagenet.instance_variable_get('@sent')).to eq(negativity.nil? ? 1 : 0)
 end
 
+Then /^the user should( not)? receive an Nexmo SMS notification$/ do |negativity|
+  expect(@sms_nexmo.instance_variable_get('@sent')).to eq(negativity.nil? ? 1 : 0)
+end
+
 Then /^the user should( not)? receive an SNS notification$/ do |negativity|
   expect(@request).to have_been_requested
   expect(@aws_sns.instance_variable_get('@sent')).to eq(negativity.nil? ? 1 : 0)

data/features/support/env.rb

@@ -168,6 +168,7 @@ Before('@notifier') do
     :redis_config => redis_opts,
     :config => {'email_queue' => 'email_notifications',
                 'sms_queue' => 'sms_notifications',
+                'sms_nexmo_queue' => 'sms_nexmo_notifications',
                 'sns_queue' => 'sns_notifications',
                 'default_contact_timezone' => 'America/New_York'})
   @notifier_redis = @notifier.instance_variable_get('@redis')

data/flapjack.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rake'
   gem.add_dependency 'gli', '= 2.12.0'
   gem.add_dependency 'nokogiri', '= 1.6.2.1'
-  gem.add_dependency 'mysql2'
+  gem.add_dependency 'nexmo', '= 2.0.0'
 end

data/lib/flapjack/cli/server.rb

@@ -60,7 +60,10 @@ module Flapjack
             return_value = start_server
           }
           puts " done."
-          exit_now!(return_value) unless return_value.nil?
+          unless return_value.nil? || [Signal.list['INT'] + 128,
+                                       Signal.list['TERM'] + 128].include?(return_value)
+            exit_now!(return_value)
+          end
         end
       end
 

data/lib/flapjack/coordinator.rb

@@ -43,7 +43,7 @@ module Flapjack
           loop do
             while sig = @received_signals.shift do
               case sig
-              when 'INT', 'TERM', 'QUIT'
+              when 'INT', 'TERM'
                 @exit_value = Signal.list[sig] + 128
                 raise Interrupt
               when 'HUP'
@@ -127,7 +127,6 @@ module Flapjack
       Kernel.trap('INT')    { @received_signals << 'INT' unless @received_signals.include?('INT') }
       Kernel.trap('TERM')   { @received_signals << 'TERM' unless @received_signals.include?('TERM') }
       unless RbConfig::CONFIG['host_os'] =~ /mswin|windows|cygwin/i
-        Kernel.trap('QUIT') { @received_signals << 'QUIT' unless @received_signals.include?('QUIT') }
         Kernel.trap('HUP')  { @received_signals << 'HUP' unless @received_signals.include?('HUP') }
       end
     end

data/lib/flapjack/data/contact.rb

@@ -19,7 +19,15 @@ module Flapjack
       attr_accessor :id, :first_name, :last_name, :email, :media,
         :media_intervals, :media_rollup_thresholds, :pagerduty_credentials
 
-      ALL_MEDIA  = ['email', 'sms', 'sms_twilio', 'sms_gammu', 'jabber', 'pagerduty', 'sns']
+      ALL_MEDIA  = [
+        'email',
+        'sms',
+        'sms_twilio',
+        'sms_nexmo',
+        'jabber',
+        'pagerduty',
+        'sns'
+      ]
 
       def self.all(options = {})
         raise "Redis connection not set" unless redis = options[:redis]

data/lib/flapjack/data/migration.rb

@@ -81,12 +81,12 @@ module Flapjack
           :redis => redis, :logger => logger)
 
         begin
-          logger.warn "Upgrading Flapjack's entity/check Redis indexes..." unless logger.nil?
-
           check_names = redis.keys('check:*').map {|c| c.sub(/^check:/, '') } |
             Flapjack::Data::EntityCheck.find_current_names(:redis => redis)
 
           unless check_names.empty?
+            logger.warn "Upgrading Flapjack's entity/check Redis indexes..." unless logger.nil?
+
             timestamp = Time.now.to_i
 
             check_names.each do |ecn|
@@ -95,10 +95,9 @@ module Flapjack
               redis.zadd("all_checks:#{entity_name}", timestamp, check)
               # not deleting the check hashes, they store useful data
             end
+            logger.warn "Checks indexed." unless logger.nil?
           end
 
-          logger.warn "Checks indexed." unless logger.nil?
-
           entity_name_keys = redis.keys("entity_id:*")
           unless entity_name_keys.empty?
             ids = redis.mget(*entity_name_keys)
@@ -112,10 +111,10 @@ module Flapjack
               redis.del(enk)
               redis.del("entity:#{entity_id}")
             end
+            logger.warn "Entities indexed." unless logger.nil?
           end
 
-          logger.warn "Entities indexed." unless logger.nil?
-          logger.warn "Indexing complete." unless logger.nil?
+          logger.warn "Indexing complete." unless logger.nil? || (check_names.empty? && entity_name_keys.empty?)
         ensure
           semaphore.release
         end

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

@@ -0,0 +1,6 @@
+<% summary = @alert.summary -%>
+<%= @alert.type_sentence_case %>: '<%= @alert.check %>' on <%= @alert.entity -%>
+<% 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}" -%>

data/lib/flapjack/gateways/sms_nexmo/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_gammu.rb → sms_nexmo.rb}

@@ -1,17 +1,19 @@
 #!/usr/bin/env ruby
 
 require 'em-synchrony'
-require "em-synchrony/mysql2"
+require 'em-synchrony/em-http'
+require 'active_support/inflector'
+
+require 'flapjack/redis_pool'
+
 require 'flapjack/data/alert'
 require 'flapjack/utility'
 
+require 'nexmo'
+
 module Flapjack
   module Gateways
-    class SmsGammu
-      INSERT_QUERY = <<-SQL
-        INSERT INTO outbox (InsertIntoDB, TextDecoded, DestinationNumber, CreatorID, Class)
-        VALUES ('%s', '%s', '%s', '%s', %s)
-      SQL
+    class SmsNexmo
 
       include Flapjack::Utility
 
@@ -19,16 +21,10 @@ module Flapjack
         @config = opts[:config]
         @logger = opts[:logger]
         @redis_config = opts[:redis_config] || {}
-
-        if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
-          @logger.error "sms_gammu config is missing"
-          return
-        end
-
         @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 1, :logger => @logger)
 
         @logger.info("starting")
-        @logger.debug("new sms_gammu gateway pikelet with the following options: #{@config.inspect}")
+        @logger.debug("new sms_nexmo gateway pikelet with the following options: #{@config.inspect}")
 
         @sent = 0
       end
@@ -44,76 +40,84 @@ module Flapjack
       end
 
       def start
-        @db = Mysql2::EM::Client.new(:host     => @config["mysql_host"],
-                                     :database => @config["mysql_database"],
-                                     :username => @config["mysql_username"],
-                                     :password => @config["mysql_password"])
-
         queue = @config['queue']
 
         until @should_quit
           begin
-            @logger.debug("sms_gammu gateway is going into blpop mode on #{queue}")
+            @logger.debug("sms_nexmo gateway is going into blpop mode on #{queue}")
             deliver( Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger) )
           rescue => e
-            @logger.error "Error generating or dispatching SMS Gammu message: #{e.class}: #{e.message}\n" +
+            @logger.error "Error generating or dispatching SMS Nexmo message: #{e.class}: #{e.message}\n" +
               e.backtrace.join("\n")
           end
         end
       end
 
       def deliver(alert)
-        @alert = alert
-        address = @alert.address
-        from    = @config["from"]
-        message = prepare_message
-        errors  = []
+        api_key = @config["api_key"]
+        secret = @config["secret"]
+        from = @config["from"]
+
+        address         = alert.address
+        notification_id = alert.notification_id
+        message_type    = alert.rollup ? 'rollup' : 'alert'
+
+        my_dir = File.dirname(__FILE__)
+        sms_template_path = case
+        when @config.has_key?('templates') && @config['templates']["#{message_type}.text"]
+          @config['templates']["#{message_type}.text"]
+        else
+          my_dir + "/sms_nexmo/#{message_type}.text.erb"
+        end
+        sms_template = ERB.new(File.read(sms_template_path), nil, '-')
 
-        [[from,    "SMS from address is missing"],
-         [address, "SMS address is missing"]].each do |val_err|
+        @alert  = alert
+        bnd     = binding
 
-          next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
-          errors << val_err.last
+        begin
+          message = sms_template.result(bnd).chomp
+        rescue => e
+          @logger.error "Error while excuting the ERB for an sms: " +
+            "ERB being executed: #{sms_template_path}"
+          raise
         end
 
-        unless errors.empty?
-          errors.each {|err| @logger.error err }
+        if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
+          @logger.error "Messagenet config is missing"
           return
         end
 
-        send_message(message, from, address)
-      rescue => e
-        @logger.error "Error generating or delivering sms to #{contents['address']}: #{e.class}: #{e.message}"
-        @logger.error e.backtrace.join("\n")
-        raise
-      end
+        errors = []
 
-      def prepare_message
-        message_type  = @alert.rollup ? 'rollup' : 'alert'
-        template_path = @config['templates']["#{message_type}.text"]
-        template      = ERB.new(File.read(template_path), nil, '-')
+        safe_message = truncate(message, 159)
 
-        begin
-          message = template.result(binding).chomp
-          truncate(message, 159)
-        rescue => e
-          @logger.error "Error while excuting the ERB for an sms: " +
-            "ERB being executed: #{template_path}"
-          raise
+        [[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|
+
+          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 }
+          return
         end
-      end
 
-      def send_message(message, from, to)
         begin
-          @db.query(INSERT_QUERY % [Time.now, message, to, from, 1])
+          nexmo = Nexmo::Client.new(key: api_key, secret: secret)
+          nexmo.send_message(from: from, to: address, text: safe_message)
           @sent += 1
-          @alert.record_send_success!
-          @logger.debug "Sent SMS via Gammu"
         rescue => e
-          @logger.error "Failed to send SMS via Gammu: #{e.class}, #{e.message}"
+          @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")
+        raise
       end
-
     end
   end
 end

data/lib/flapjack/gateways/web/public/js/modules/contact.js

@@ -279,7 +279,7 @@
     initialize: function(options) {
       var context = this;
 
-      _.each(['email', 'sms', 'sms_twilio', 'sns', 'jabber'], function(type) {
+      _.each(['email', 'sms', 'sms_twilio', 'sms_nexmo', 'sns', 'jabber'], function(type) {
         var medium = context.collection.find(function(cm) {
           return cm.get('type') == type;
         });
@@ -335,6 +335,7 @@
         'email'      : 'Email',
         'sms'        : 'SMS (MessageNet)',
         'sms_twilio' : 'SMS (Twilio)',
+        'sms_nexmo'  : 'SMS (Nexmo)',
         'sns'        : 'SMS (Amazon SNS)',
         'jabber'     : 'Jabber'
       };

data/lib/flapjack/notifier.rb

@@ -16,7 +16,7 @@ require 'flapjack/utility'
 require 'flapjack/gateways/email'
 require 'flapjack/gateways/sms_messagenet'
 require 'flapjack/gateways/sms_twilio'
-require 'flapjack/gateways/sms_gammu'
+require 'flapjack/gateways/sms_nexmo'
 require 'flapjack/gateways/aws_sns'
 
 module Flapjack

data/lib/flapjack/pikelet.rb

@@ -24,7 +24,7 @@ require 'flapjack/gateways/pagerduty'
 require 'flapjack/gateways/email'
 require 'flapjack/gateways/sms_messagenet'
 require 'flapjack/gateways/sms_twilio'
-require 'flapjack/gateways/sms_gammu'
+require 'flapjack/gateways/sms_nexmo'
 require 'flapjack/gateways/aws_sns'
 require 'flapjack/gateways/web'
 require 'flapjack/logger'
@@ -104,8 +104,8 @@ module Flapjack
                       'oobetet'    => Flapjack::Gateways::Oobetet,
                       'email'      => Flapjack::Gateways::Email,
                       'sms'        => Flapjack::Gateways::SmsMessagenet,
-                      'sms_gammu'  => Flapjack::Gateways::SmsGammu,
                       'sms_twilio' => Flapjack::Gateways::SmsTwilio,
+                      'sms_nexmo'  => Flapjack::Gateways::SmsNexmo,
                       'sns'        => Flapjack::Gateways::AwsSns}
 
       def self.create(type, opts = {})

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "1.2.2"
+  VERSION = "1.3.0rc1"
 end
 

data/spec/lib/flapjack/coordinator_spec.rb

@@ -171,7 +171,6 @@ describe Flapjack::Coordinator do
 
     expect(Kernel).to receive(:trap).with('INT').and_yield
     expect(Kernel).to receive(:trap).with('TERM').and_yield
-    expect(Kernel).to receive(:trap).with('QUIT').and_yield
     expect(Kernel).to receive(:trap).with('HUP').and_yield
 
     expect(config).to receive(:all).and_return({})
@@ -179,7 +178,7 @@ describe Flapjack::Coordinator do
     fc = Flapjack::Coordinator.new(config)
 
     fc.send(:setup_signals)
-    expect(fc.instance_variable_get('@received_signals')).to eq(['INT', 'TERM', 'QUIT', 'HUP'])
+    expect(fc.instance_variable_get('@received_signals')).to eq(['INT', 'TERM', 'HUP'])
   end
 
   it "only traps two system signals on Windows" do
@@ -189,7 +188,6 @@ describe Flapjack::Coordinator do
 
     expect(Kernel).to receive(:trap).with('INT').and_yield
     expect(Kernel).to receive(:trap).with('TERM').and_yield
-    expect(Kernel).not_to receive(:trap).with('QUIT')
     expect(Kernel).not_to receive(:trap).with('HUP')
 
     expect(config).to receive(:all).and_return({})

data/spec/lib/flapjack/data/contact_spec.rb

@@ -22,8 +22,8 @@ describe Flapjack::Data::Contact, :redis => true do
      :tags               => Set.new([]),
      :time_restrictions  => [],
      :unknown_media      => [],
-     :warning_media      => ['email', 'sms', 'sms_twilio', 'sms_gammu', 'jabber', 'pagerduty', 'sns'],
-     :critical_media     => ['email', 'sms', 'sms_twilio', 'sms_gammu', 'jabber', 'pagerduty', 'sns'],
+     :warning_media      => ['email', 'sms', 'sms_twilio', 'sms_nexmo', 'jabber', 'pagerduty', 'sns'],
+     :critical_media     => ['email', 'sms', 'sms_twilio', 'sms_nexmo', 'jabber', 'pagerduty', 'sns'],
      :unknown_blackhole  => false,
      :warning_blackhole  => false,
      :critical_blackhole => false}

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

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'nexmo'
+require 'flapjack/gateways/sms_nexmo'
+
+describe Flapjack::Gateways::SmsNexmo, :logger => true do
+  let(:lock) { double(Monitor) }
+
+  let(:redis) { double('redis') }
+
+  let(:nexmo_client) { double(Nexmo::Client) }
+
+  let(:config) { {'api_key' => 'THEAPIKEY',
+                  'secret'  => 'secret', 
+                  'from'    => 'flapjack'
+                 }
+               }
+
+  let(:time) { Time.new(2013, 10, 31, 13, 45) }
+
+  let(:time_str) { Time.at(time).strftime('%-d %b %H:%M') }
+
+  let(:message) { {'notification_type'  => 'recovery',
+                   'contact_first_name' => 'John',
+                   'contact_last_name'  => 'Smith',
+                   'state'              => 'ok',
+                   'summary'            => 'smile',
+                   'last_state'         => 'problem',
+                   'last_summary'       => 'frown',
+                   'time'               => time.to_i,
+                   'address'            => '0034123456789',
+                   'event_id'           => 'example.com:ping',
+                   'id'                 => '123456789',
+                   'duration'           => 55,
+                   'state_duration'     => 23
+                  }
+                }
+
+  it "sends an SMS message" do
+    EM.synchrony do
+      expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+      expect(Nexmo::Client).to receive(:new).and_return(nexmo_client)
+      expect(nexmo_client).to receive(:send_message).
+        with(from: "flapjack",
+             to:   "0034123456789",
+             text: "Recovery: 'ping' on example.com is OK at 31 Oct 13:45, smile")
+
+      alert = Flapjack::Data::Alert.new(message, :logger => @logger)
+      sms_nexmo = Flapjack::Gateways::SmsNexmo.new(:config => config, :logger => @logger)
+      sms_nexmo.deliver(alert)
+      EM.stop
+    end
+  end
+
+  it "does not send an SMS message with an invalid configuration" do
+    EM.synchrony do
+      expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+      expect_any_instance_of(Nexmo::Client).not_to receive(:send_message)
+
+      alert = Flapjack::Data::Alert.new(message, :logger => @logger)
+      sms_nexmo = Flapjack::Gateways::SmsNexmo.new(:config => config.reject {|k, v| k == 'secret'}, :logger => @logger)
+      sms_nexmo.deliver(alert)
+      EM.stop
+    end
+  end
+end

data/tasks/support/flapjack_config_benchmark.yaml

@@ -21,6 +21,7 @@ test:
     queue: notifications
     email_queue: email_notifications
     sms_queue: sms_notifications
+    sms_nexmo_queue: sms_nexmo_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
     notification_log_file: log/notification_test.log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0rc1
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -350,19 +350,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.2.1
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: nexmo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 description: Flapjack is a distributed monitoring notification system that provides
   a scalable method for processing streams of events from Nagios and deciding who
   should be notified
@@ -470,10 +470,12 @@ files:
 - lib/flapjack/gateways/oobetet.rb
 - lib/flapjack/gateways/pagerduty.rb
 - lib/flapjack/gateways/pagerduty/alert.text.erb
-- lib/flapjack/gateways/sms_gammu.rb
 - lib/flapjack/gateways/sms_messagenet.rb
 - lib/flapjack/gateways/sms_messagenet/alert.text.erb
 - lib/flapjack/gateways/sms_messagenet/rollup.text.erb
+- lib/flapjack/gateways/sms_nexmo.rb
+- lib/flapjack/gateways/sms_nexmo/alert.text.erb
+- lib/flapjack/gateways/sms_nexmo/rollup.text.erb
 - lib/flapjack/gateways/sms_twilio.rb
 - lib/flapjack/gateways/sms_twilio/alert.text.erb
 - lib/flapjack/gateways/sms_twilio/rollup.text.erb
@@ -576,6 +578,7 @@ files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet_spec.rb
+- spec/lib/flapjack/gateways/sms_nexmo_spec.rb
 - spec/lib/flapjack/gateways/sms_twilio_spec.rb
 - spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb
@@ -635,9 +638,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -699,6 +702,7 @@ test_files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet_spec.rb
+- spec/lib/flapjack/gateways/sms_nexmo_spec.rb
 - spec/lib/flapjack/gateways/sms_twilio_spec.rb
 - spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb