flapjack 0.6.46 → 0.6.47

data/bin/flapjack-nagios-receiver

@@ -35,7 +35,6 @@ config = Flapjack::Configuration.new
 config.load(options.config)
 @config_env = config.all
 @redis_options = config.for_redis
-puts @redis_options.inspect
 
 if @config_env.nil? || @config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
@@ -95,7 +94,7 @@ def process_input(redis)
 end
 
 def main
-  redis = Redis.new(@redis_options.merge(:driver => 'ruby'))
+  redis = Redis.new(@redis_options)
 
   while true
     process_input(redis)

data/bin/flapjack-populator

@@ -64,14 +64,12 @@ when "import-contacts"
 
   if contacts && contacts.is_a?(Enumerable) && contacts.any? {|e| !e['id'].nil?}
     @persistence = Redis.new(redis_options)
-    @persistence.multi do
-      contacts.each do |contact|
-        unless contact['id']
-          puts "Contact not imported as it has no id: " + contact.inspect
-          next
-        end
-        Flapjack::Data::Contact.add(contact, :redis => @persistence)
+    contacts.each do |contact|
+      unless contact['id']
+        puts "Contact not imported as it has no id: " + contact.inspect
+        next
       end
+      Flapjack::Data::Contact.add(contact, :redis => @persistence)
     end
     @persistence.quit
   end
@@ -81,7 +79,6 @@ when "import-entities"
 
   if entities && entities.is_a?(Enumerable) && entities.any? {|e| !e['id'].nil?}
     @persistence = Redis.new(redis_options)
-    @persistence.multi
     entities.each do |entity|
       unless entity['id']
         puts "Entity not imported as it has no id: " + entity.inspect
@@ -89,7 +86,6 @@ when "import-entities"
       end
       Flapjack::Data::Entity.add(entity, :redis => @persistence)
     end
-    @persistence.exec
     @persistence.quit
   end
 

data/features/notifications.feature

@@ -44,13 +44,11 @@ Feature: notifications
     When the SMS notification handler fails to send an SMS
     Then the user should not receive an SMS notification
 
-  @email
   Scenario: Send a queued email notification
     Given a user email notification has been queued for entity 'example.com'
     When the email notification handler runs successfully
     Then the user should receive an email notification
 
-  @email
   Scenario: Handle a failure to send a queued email notification
     Given a user email notification has been queued for entity 'example.com'
     When the email notification handler fails to send an email

data/features/steps/notifications_steps.rb

@@ -1,6 +1,4 @@
 
-include Mail::Matchers
-
 # copied from flapjack-populator
 # TODO use Flapjack::Data::Contact.add
 def add_contact(contact = {})
@@ -125,57 +123,72 @@ end
 
 # TODO may need to get more complex, depending which SMS provider is used
 When /^the SMS notification handler runs successfully$/ do
-  # returns success by default - currently matches all addresses, maybe load from config?
-  stub_request(:get, /.*/)
-  # TODO load config from cfg file instead?
-  Flapjack::Gateways::Sms.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
+  @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_URL)}/)
 
-  lambda {
-    Flapjack::Gateways::Sms.dispatch(@sms_notification, :logger => @logger, :redis => @redis)
-  }.should_not raise_error
-  @sms_sent = true
+  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
+  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)
+  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@sent', 0)
+  Flapjack::Gateways::SmsMessagenet.perform(@sms_notification)
 end
 
 When /^the SMS notification handler fails to send an SMS$/ do
-  stub_request(:any, /.*/).to_return(:status => [500, "Internal Server Error"])
-
-  lambda {
-    Flapjack::Gateways::Sms.dispatch(@sms_notification, :logger => @logger, :redis => @redis)
-  }.should raise_error
-  @sms_sent = false
+  @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_URL)}/).to_return(:status => [500, "Internal Server Error"])
+  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
+  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)
+  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@sent', 0)
+  Flapjack::Gateways::SmsMessagenet.perform(@sms_notification)
 end
 
 When /^the email notification handler runs successfully$/ do
   Resque.redis = @redis
-  Flapjack::Gateways::Email.bootstrap(:config => {})
-  lambda {
-    Flapjack::Gateways::Email.perform(@email_notification)
-  }.should_not raise_error
+  Flapjack::Gateways::Email.bootstrap(:config => {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525}})
+  Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
+  Flapjack::Gateways::Email.instance_variable_set('@sent', 0)
+
+  # poor man's stubbing
+  EM::P::SmtpClient.class_eval {
+    def self.send(args = {})
+      me = MockEmailer.new
+      me.set_deferred_status :succeeded, OpenStruct.new(:code => 250)
+      me
+    end
+  }
+
+  Flapjack::Gateways::Email.perform(@email_notification)
 end
 
-# This doesn't work as I have it here -- sends a mail with an empty To: header instead.
-# Might have to introduce Rspec's stubs here to fake bad mailer behaviour -- or if mail sending
-# won't ever fail, don't test for failure?
 When /^the email notification handler fails to send an email$/ do
-  pending
-  lambda {
-    @email_notification['address'] = nil
-    Flapjack::Gateways::Email.perform(@email_notification)
-  }.should_not raise_error
+  Resque.redis = @redis
+  Flapjack::Gateways::Email.bootstrap(:config => {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525}})
+  Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
+  Flapjack::Gateways::Email.instance_variable_set('@sent', 0)
+
+  # poor man's stubbing
+  EM::P::SmtpClient.class_eval {
+    def self.send(args = {})
+      me = MockEmailer.new
+      me.set_deferred_status :failed, OpenStruct.new(:code => 500)
+      me
+    end
+  }
+
+  Flapjack::Gateways::Email.perform(@email_notification)
 end
 
 Then /^the user should receive an SMS notification$/ do
-  @sms_sent.should be_true
+  @request.should have_been_requested
+  Flapjack::Gateways::SmsMessagenet.instance_variable_get('@sent').should == 1
 end
 
 Then /^the user should receive an email notification$/ do
-  have_sent_email.should be_true
+  Flapjack::Gateways::Email.instance_variable_get('@sent').should == 1
 end
 
 Then /^the user should not receive an SMS notification$/ do
-  @sms_sent.should be_false
+  @request.should have_been_requested
+  Flapjack::Gateways::SmsMessagenet.instance_variable_get('@sent').should == 0
 end
 
 Then /^the user should not receive an email notification$/ do
-  have_sent_email.should be_false
+  Flapjack::Gateways::Email.instance_variable_get('@sent').should == 0
 end

data/features/support/env.rb

@@ -38,8 +38,9 @@ class MockLogger
   end
 end
 
-Mail.defaults do
-  delivery_method :test
+# poor man's stubbing
+class MockEmailer
+  include EM::Deferrable
 end
 
 redis_opts = { :db => 14, :driver => :ruby }
@@ -79,10 +80,6 @@ Before('@resque') do
   ResqueSpec.reset!
 end
 
-Before('@email') do
-  Mail::TestMailer.deliveries.clear
-end
-
 After('@time') do
   Delorean.back_to_the_present
 end

data/lib/flapjack/coordinator.rb

@@ -27,7 +27,7 @@ require 'flapjack/gateways/jabber'
 require 'flapjack/gateways/oobetet'
 require 'flapjack/gateways/pagerduty'
 require 'flapjack/gateways/email'
-require 'flapjack/gateways/sms'
+require 'flapjack/gateways/sms_messagenet'
 require 'flapjack/gateways/web'
 
 module Flapjack
@@ -270,7 +270,7 @@ module Flapjack
                      'pagerduty'  => Flapjack::Gateways::Pagerduty,
                      'oobetet'    => Flapjack::Gateways::Oobetet,
                      'email'      => Flapjack::Gateways::Email,
-                     'sms'        => Flapjack::Gateways::Sms}
+                     'sms'        => Flapjack::Gateways::SmsMessagenet}
 
 
     def pikelets(config_env)

data/lib/flapjack/data/contact.rb

@@ -36,24 +36,24 @@ module Flapjack
                    redis.keys('contacts_for:*') )
       end
 
-      def self.find_by_id(id, options = {})
+      def self.find_by_id(contact_id, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
-        raise "No id value passed" unless id
+        raise "No id value passed" unless contact_id
         logger = options[:logger]
 
-        return unless redis.hexists("contact:#{id}", 'first_name')
+        return unless redis.hexists("contact:#{contact_id}", 'first_name')
 
-        fn, ln, em = redis.hmget("contact:#{id}", 'first_name', 'last_name', 'email')
-        me = redis.hgetall("contact_media:#{id}")
+        fn, ln, em = redis.hmget("contact:#{contact_id}", 'first_name', 'last_name', 'email')
+        me = redis.hgetall("contact_media:#{contact_id}")
 
         # similar to code in instance method pagerduty_credentials
         pc = nil
-        if service_key = redis.hget("contact_media:#{id}", 'pagerduty')
-          pc = redis.hgetall("contact_pagerduty:#{id}").merge('service_key' => service_key)
+        if service_key = redis.hget("contact_media:#{contact_id}", 'pagerduty')
+          pc = redis.hgetall("contact_pagerduty:#{contact_id}").merge('service_key' => service_key)
         end
 
         self.new(:first_name => fn, :last_name => ln,
-          :email => em, :id => id, :media => me, :pagerduty_credentials => pc, :redis => redis )
+          :email => em, :id => contact_id, :media => me, :pagerduty_credentials => pc, :redis => redis )
       end
 
 

data/lib/flapjack/data/entity.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'flapjack/data/contact'
+require 'flapjack/data/tag'
 
 module Flapjack
 
@@ -8,7 +9,7 @@ module Flapjack
 
     class Entity
 
-      attr_accessor :name, :id
+      attr_accessor :name, :id, :tags
 
       def self.all(options = {})
         raise "Redis connection not set" unless redis = options[:redis]
@@ -38,10 +39,14 @@ module Flapjack
               redis.sadd("contacts_for:#{entity['id']}", contact_id)
             }
           end
+          self.new(:name  => entity['name'],
+                   :id    => entity['id'],
+                   :redis => redis)
         else
           # empty string is the redis equivalent of a Ruby nil, i.e. key with
           # no value
           redis.set("entity_id:#{entity['name']}", '')
+          nil
         end
       end
 
@@ -102,6 +107,21 @@ module Flapjack
         checks.length
       end
 
+      def add_tags(*enum)
+        enum.each do |t|
+          Flapjack::Data::Tag.create("#{@tag_prefix}:#{t}", [@id], :redis => @redis)
+          @tags.add(t)
+        end
+      end
+
+      def delete_tags(*enum)
+        enum.each do |t|
+          tag = Flapjack::Data::Tag.find("#{@tag_prefix}:#{t}", :redis => @redis)
+          tag.delete(@id)
+          @tags.delete(t)
+        end
+      end
+
     private
 
       # NB: initializer should not be used directly -- instead one of the finder methods
@@ -111,6 +131,16 @@ module Flapjack
         raise "Entity name not set" unless @name = options[:name]
         @id = options[:id]
         @logger = options[:logger]
+
+        @tag_prefix = 'entity_tag'
+        @tags = ::Set.new
+        tag_data = @redis.keys("#{@tag_prefix}:*").inject([]) do |memo, entity_tag|
+          tag = Flapjack::Data::Tag.find(entity_tag, :redis => @redis)
+          memo << entity_tag.sub(%r(^#{@tag_prefix}:), '') if tag.include?(@id.to_s)
+          memo
+        end
+        @tags.merge(tag_data)
+
       end
 
     end

data/lib/flapjack/data/event.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'yajl'
+
 module Flapjack
   module Data
     class Event

data/lib/flapjack/data/tag.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+require 'set'
+require 'redis'
+
+module Flapjack
+  module Data
+
+    class Tag < ::Set
+
+      attr_accessor :name
+
+      def initialize(opts)
+        @name  = opts[:name]
+        @redis = opts[:redis]
+        preset = @redis.smembers(@name)
+        enum = opts[:create] || []
+        @redis.sadd(@name, enum) unless enum.empty?
+        super(enum | preset)
+      end
+
+      def self.find(name, opts)
+        self.new(:name => name,
+                 :redis => opts[:redis])
+      end
+
+      def self.create(name, enum = [], opts)
+        self.new(:name => name,
+                 :create => enum,
+                 :redis => opts[:redis])
+      end
+
+      def add(o)
+        @redis.sadd(@name, o) unless o.empty?
+        super(o)
+      end
+
+      def delete(o)
+        @redis.srem(@name, o)
+        super(o)
+      end
+
+      def merge(o)
+        @redis.sadd(@name, o) unless o.empty?
+        super(o)
+      end
+
+    end
+  end
+end
+

data/lib/flapjack/executive.rb

@@ -18,7 +18,7 @@ require 'flapjack/pikelet'
 require 'flapjack/redis_pool'
 
 require 'flapjack/gateways/email'
-require 'flapjack/gateways/sms'
+require 'flapjack/gateways/sms_messagenet'
 
 module Flapjack
 
@@ -256,7 +256,7 @@ module Flapjack
         # TODO consider changing Resque jobs to use raw blpop like the others
         case media_type
         when :sms
-          Resque.enqueue_to(@queues[:sms], Flapjack::Gateways::Sms, contents)
+          Resque.enqueue_to(@queues[:sms], Flapjack::Gateways::SmsMessagenet, contents)
         when :email
           Resque.enqueue_to(@queues[:email], Flapjack::Gateways::Email, contents)
         when :jabber

data/lib/flapjack/gateways/email.rb

@@ -5,8 +5,10 @@ require 'erb'
 require 'haml'
 require 'socket'
 
-require 'flapjack/data/entity_check'
+require 'em-synchrony'
+require 'em/protocols/smtpclient'
 
+require 'flapjack/data/entity_check'
 require 'flapjack/gateways/base'
 
 module Flapjack
@@ -19,24 +21,10 @@ module Flapjack
 
         alias_method :orig_bootstrap, :bootstrap
 
-        # See https://github.com/mikel/mail/blob/master/lib/mail/mail.rb#L53
-        # & https://github.com/mikel/mail/blob/master/spec/mail/configuration_spec.rb
-        # for details of configuring mail gem. defaults to SMTP, localhost, port 25
         def bootstrap(opts = {})
           return if @bootstrapped
-
-          sc = opts[:config].delete('smtp_config')
-
-          if sc
-            smtp_config = sc.keys.inject({}) do |ret,obj|
-                ret[obj.to_sym] = sc[obj]
-                ret
-            end
-
-            Mail.defaults {
-              delivery_method :smtp, {:enable_starttls_auto => false}.merge(smtp_config)
-            }
-          end
+          @smtp_config = opts[:config].delete('smtp_config')
+          @sent = 0
           orig_bootstrap(opts)
         end
 
@@ -49,7 +37,6 @@ module Flapjack
           state              = notification['state']
           summary            = notification['summary']
           time               = notification['time']
-          entity, check      = notification['event_id'].split(':')
 
           entity_check = Flapjack::Data::EntityCheck.for_event_id(notification['event_id'],
             :redis => ::Resque.redis)
@@ -63,37 +50,58 @@ module Flapjack
 
           headline = headline_map[notification_type] || ''
 
-          subject = "#{headline}'#{check}' on #{entity}"
+          subject = "#{headline}'#{entity_check.check}' on #{entity_check.entity_name}"
           subject += " is #{state.upcase}" unless ['acknowledgement', 'test'].include?(notification_type)
 
           notification['subject'] = subject
 
-          mail = prepare_email(notification, :logger => @logger,
-                  :in_scheduled_maintenance   => entity_check.in_scheduled_maintenance?,
-                  :in_unscheduled_maintenance => entity_check.in_unscheduled_maintenance?)
-          mail.deliver!
+          begin
+            host = @smtp_config ? @smtp_config['host'] : nil
+            port = @smtp_config ? @smtp_config['port'] : nil
+
+            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']
+
+            mail = prepare_email(notification,
+                    :from => m_from, :to => m_to,
+                    :in_scheduled_maintenance   => entity_check.in_scheduled_maintenance?,
+                    :in_unscheduled_maintenance => entity_check.in_unscheduled_maintenance?)
+
+            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)
+
+            response = EM::Synchrony.sync(email)
+
+            # http://tools.ietf.org/html/rfc821#page-36 SMTP response codes
+            if response && response.respond_to?(:code) &&
+              ((response.code == 250) || (response.code == 251))
+              @logger.info "Email sending succeeded"
+              @sent += 1
+            else
+              @logger.info "Email sending failed"
+            end
+
+            @logger.info "Email response: #{response.inspect}"
+
+          rescue Exception => e
+            @logger.error "Error delivering email to #{mail.to}: #{e.message}"
+            @logger.error e.backtrace.join("\n")
+          end
         end
 
       end
 
     private
 
-      def self.prepare_email(notification, opts)
-
-        logger = opts[:logger]
-
-        # not using socket and gethostname as that doesn't give you a fqdn.
-        # see the facter issue: https://projects.puppetlabs.com/issues/3898
-        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']
-        m_subject  = notification['subject']
-
-        logger.debug("sending Flapjack::Notification::Email " +
-          "#{notification['id']} to: #{m_to} subject: #{m_subject}")
+      def self.prepare_email(notification, opts = {})
 
         @notification_type  = notification['notification_type']
         @contact_first_name = notification['contact_first_name']
@@ -105,6 +113,11 @@ module Flapjack
         @in_unscheduled_maintenance = opts[:in_unscheduled_maintenance]
         @in_scheduled_maintenance   = opts[:in_scheduled_maintenance]
 
+        m_subject  = notification['subject']
+
+        @logger.debug("sending Flapjack::Notification::Email " +
+          "#{notification['id']} to: #{opts[:to]} subject: #{m_subject}")
+
         text_template = ERB.new(File.read(File.dirname(__FILE__) +
           '/email/alert.text.erb'))
 
@@ -113,11 +126,13 @@ module Flapjack
 
         mail_scope = self
 
+        # this part is the only use of the mail gem -- maybe this can be done
+        # using standard library calls instead?
         mail = Mail.new do
-          from     m_from
-          to       m_to
+          from     opts[:from]
+          to       opts[:to]
           subject  m_subject
-          reply_to m_reply_to
+          reply_to opts[:from]
 
           text_part do
             body text_template.result(binding)

data/lib/flapjack/gateways/oobetet.rb

@@ -111,7 +111,7 @@ module Flapjack
 
         stanza_body = stanza.body
 
-        logger.debug("groupchat stanza body: " + stanza_body)
+        logger.debug("groupchat stanza body: #{stanza_body}")
         logger.debug("groupchat message received: #{stanza.inspect}")
 
         if (stanza_body =~ /^(?:problem|recovery|acknowledgement)/i) &&

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+
+require 'em-synchrony'
+require 'em-synchrony/em-http'
+
+require 'flapjack/gateways/base'
+
+module Flapjack
+  module Gateways
+    class SmsMessagenet
+      extend Flapjack::Gateways::Resque
+
+      MESSAGENET_URL = 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
+
+      class << self
+
+        alias_method :orig_bootstrap, :bootstrap
+
+        def bootstrap(opts = {})
+          return if @bootstrapped
+          @sent = 0
+          orig_bootstrap(opts)
+        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']
+          time               = notification['time']
+          entity, check      = notification['event_id'].split(':')
+
+          headline_map = {'problem'         => 'PROBLEM: ',
+                          'recovery'        => 'RECOVERY: ',
+                          'acknowledgement' => 'ACK: ',
+                          'test'            => 'TEST NOTIFICATION: ',
+                          'unknown'         => '',
+                          ''                => '',
+                         }
+
+          headline = headline_map[notification_type] || ''
+
+          message = "#{headline}'#{check}' on #{entity}"
+          message += " is #{state.upcase}" unless ['acknowledgement', 'test'].include?(notification_type)
+          message += " at #{Time.at(time).strftime('%-d %b %H:%M')}, #{summary}"
+
+          notification['message'] = message
+
+          # TODO log error and skip instead of raising errors
+          if config.nil? || (config.respond_to?(:empty?) && config.empty?)
+            logger.error "Messagenet config is missing"
+            return
+          end
+
+          errors = []
+
+          username = config["username"]
+          password = config["password"]
+          address  = notification['address']
+          message  = notification['message']
+          notification_id = notification['id']
+
+          [[username, "Messagenet username is missing"],
+           [password, "Messagenet password is missing"],
+           [address,  "SMS address is missing"],
+           [message,  "SMS message 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
+
+          query = {'Username'     => username,
+                   'Pwd'          => password,
+                   'PhoneNumber'  => address,
+                   'PhoneMessage' => message}
+
+          http = EM::HttpRequest.new(MESSAGENET_URL).get(:query => query)
+
+          logger.debug "server response: #{http.response}"
+
+          status = (http.nil? || http.response_header.nil?) ? nil : http.response_header.status
+          if (status >= 200) && (status <= 206)
+            @sent += 1
+            logger.info "Sent SMS via Messagenet, response status is #{status}, " +
+              "notification_id: #{notification_id}"
+          else
+            logger.error "Failed to send SMS via Messagenet, response status is #{status}, " +
+              "notification_id: #{notification_id}"
+          end
+
+        end
+      end
+    end
+  end
+end
+

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.6.46"
+  VERSION = "0.6.47"
 end

data/spec/lib/flapjack/data/entity_spec.rb

@@ -135,4 +135,57 @@ describe Flapjack::Data::Entity, :redis => true do
     entities.first.should == 'abc-123'
   end
 
-end
+  it "adds tags to entities" do
+    entity = Flapjack::Data::Entity.add({'id'       => '5000',
+                                         'name'     => 'abc-123',
+                                         'contacts' => []},
+                                        :redis => @redis)
+
+    entity.add_tags('source:foobar', 'foo')
+
+    entity.should_not be_nil
+    entity.should be_an(Flapjack::Data::Entity)
+    entity.name.should == 'abc-123'
+    entity.tags.should include("source:foobar")
+    entity.tags.should include("foo")
+
+    # and test the tags as read back from redis
+    entity = Flapjack::Data::Entity.find_by_id('5000', :redis => @redis)
+    entity.tags.should include("source:foobar")
+    entity.tags.should include("foo")
+
+  end
+
+  it "deletes tags from entities" do
+    entity = Flapjack::Data::Entity.add({'id'       => '5000',
+                                         'name'     => 'abc-123',
+                                         'contacts' => []},
+                                        :redis => @redis)
+
+    entity.add_tags('source:foobar', 'foo')
+
+    entity.should_not be_nil
+    entity.tags.should include("source:foobar")
+    entity.tags.should include("foo")
+
+    entity.delete_tags('source:foobar')
+
+    entity.tags.should_not include("source:foobar")
+    entity.tags.should include("foo")
+
+  end
+
+  it "finds entities by tag" do
+    entity = Flapjack::Data::Entity.add({'id'       => '5000',
+                                         'name'     => 'abc-123',
+                                         'contacts' => []},
+                                        :redis => @redis)
+
+    entity.add_tags('source:foobar', 'foo')
+
+    entity.should_not be_nil
+    entity.should be_an(Flapjack::Data::Entity)
+    # TODO - the rest of it
+  end
+
+end

data/spec/lib/flapjack/data/tag_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'flapjack/data/entity'
+
+describe Flapjack::Data::Tag, :redis => true do
+
+  it "adds references to tags"
+
+  it "deletes references from tags"
+
+  it "lists references contained in a tag"
+
+end

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'flapjack/gateways/sms_messagenet'
+
+describe Flapjack::Gateways::SmsMessagenet do
+
+end

data/tasks/events.rake

@@ -13,12 +13,17 @@ namespace :events do
 
     require 'flapjack/configuration'
     require 'flapjack/data/event'
+    require 'flapjack/data/entity_check'
 
     FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
     config_file = File.join('etc', 'flapjack_config.yaml')
-    @config, @redis_config = Flapjack::Configuration.new.load( config_file )
+    config = Flapjack::Configuration.new
+    config.load( config_file )
 
-    if @config.nil? || @config.empty?
+    @config_env = config.all
+    @redis_config = config.for_redis
+
+    if @config_env.nil? || @config_env.empty?
       puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{config_file}'"
       exit(false)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.46
+  version: 0.6.47
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -390,6 +390,7 @@ files:
 - lib/flapjack/data/global.rb
 - lib/flapjack/data/message.rb
 - lib/flapjack/data/notification.rb
+- lib/flapjack/data/tag.rb
 - lib/flapjack/executive.rb
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
@@ -408,8 +409,7 @@ files:
 - lib/flapjack/gateways/jabber.rb
 - lib/flapjack/gateways/oobetet.rb
 - lib/flapjack/gateways/pagerduty.rb
-- lib/flapjack/gateways/sms.rb
-- lib/flapjack/gateways/sms/messagenet.rb
+- lib/flapjack/gateways/sms_messagenet.rb
 - lib/flapjack/gateways/web.rb
 - lib/flapjack/gateways/web/views/_css.haml
 - lib/flapjack/gateways/web/views/_nav.haml
@@ -432,6 +432,7 @@ files:
 - spec/lib/flapjack/data/global_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
+- spec/lib/flapjack/data/tag_spec.rb
 - spec/lib/flapjack/executive_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
@@ -446,7 +447,7 @@ files:
 - spec/lib/flapjack/gateways/jabber_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
-- spec/lib/flapjack/gateways/sms_spec.rb
+- spec/lib/flapjack/gateways/sms_messagenet.spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
@@ -511,6 +512,7 @@ test_files:
 - spec/lib/flapjack/data/global_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
+- spec/lib/flapjack/data/tag_spec.rb
 - spec/lib/flapjack/executive_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
@@ -525,7 +527,7 @@ test_files:
 - spec/lib/flapjack/gateways/jabber_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
-- spec/lib/flapjack/gateways/sms_spec.rb
+- spec/lib/flapjack/gateways/sms_messagenet.spec.rb
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb

data/lib/flapjack/gateways/sms.rb

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'flapjack/pikelet'
-require 'flapjack/gateways/sms/messagenet'
-
-module Flapjack
-  module Gateways
-
-    class Sms
-      extend Flapjack::Gateways::Resque
-
-      class << self
-
-        def perform(notification)
-          @logger.debug "Woo, got a notification to send out: #{notification.inspect}"
-          dispatch(notification, :logger => @logger, :redis => ::Resque.redis)
-        end
-
-        def dispatch(notification, opts = {})
-          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']
-          time               = notification['time']
-          entity, check      = notification['event_id'].split(':')
-
-          headline_map = {'problem'         => 'PROBLEM: ',
-                          'recovery'        => 'RECOVERY: ',
-                          'acknowledgement' => 'ACK: ',
-                          'test'            => 'TEST NOTIFICATION: ',
-                          'unknown'         => '',
-                          ''                => '',
-                         }
-
-          headline = headline_map[notification_type] || ''
-
-          message = "#{headline}'#{check}' on #{entity}"
-          message += " is #{state.upcase}" unless ['acknowledgement', 'test'].include?(notification_type)
-          message += " at #{Time.at(time).strftime('%-d %b %H:%M')}, #{summary}"
-
-          notification['message'] = message
-          Flapjack::Gateways::Sms::Messagenet.sender(notification,
-            :logger => opts[:logger],
-            :config => Flapjack::Gateways::Sms.instance_variable_get('@config'))
-        end
-
-      end
-
-    end
-  end
-end
-

data/lib/flapjack/gateways/sms/messagenet.rb

@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'net/http'
-require 'uri'
-
-module Flapjack
-  module Gateways
-    class Sms
-      class Messagenet
-
-        def self.sender(notification, options = {})
-          logger = options[:logger]
-          config = options[:config]
-
-          unless config && (username = config["username"])
-            raise RuntimeError.new('sms_messagenet: username is missing')
-          end
-          unless config && (password = config["password"])
-            raise RuntimeError.new('sms_messagenet: password is missing')
-          end
-
-          raise RuntimeError.new('address is missing') unless address         = notification['address']
-          raise RuntimeError.new('message is missing') unless message         = notification['message']
-          raise RuntimeError.new('id is missing')      unless notification_id = notification['id']
-
-          params = { 'Username'     => username,
-                     'Pwd'          => password,
-                     'PhoneNumber'  => address,
-                     'PhoneMessage' => message }
-
-          uri       = URI('https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage')
-          uri.query = URI.encode_www_form(params)
-          logger.debug("request_uri: #{uri.request_uri.inspect}")
-
-          Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-            request = Net::HTTP::Get.new uri.request_uri
-            response = http.request request
-            http_success = ( response.is_a?(Net::HTTPSuccess) == true )
-            logger.debug("Flapjack::Notification::SMSMessagenet: response from server: #{response.body}")
-            raise RuntimeError.new "Failed to send SMS via messagenet, http response is a #{response.class}, notification_id: #{notification_id}" unless http_success
-          end
-
-        end
-      end
-    end
-  end
-end
-
-

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

@@ -1,6 +0,0 @@
-require 'spec_helper'
-require 'flapjack/gateways/sms'
-
-describe Flapjack::Gateways::Sms do
-
-end