aws-alert-monitor 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: "rake spec"

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.0.4:
+
+* Updated email message format and content
+
 ## 0.0.3:
 
 * Log message if destination set to nil

data/README.md

@@ -1,4 +1,6 @@
-# Aws::Alert::Monitor
+[![Build Status](https://secure.travis-ci.org/intuit/aws-alert-monitor.png)](http://travis-ci.org/intuit/aws-alert-monitor)
+
+## AWS Alert Monitor
 
 AWS Alert Monitor listenting to an SQS queue for alarms and sends email via SES based on rules applied in ~/.aws-alert-monitor.yml to those alerts.
 

data/lib/aws-alert-monitor/alert.rb

@@ -27,43 +27,46 @@ module AwsAlertMonitor
     private
 
     def send_alert(policy)
-      message_source      = policy['email']['source']
-      message_destination = policy['email']['destination']
+      @message_source      = policy['email']['source']
+      @message_destination = policy['email']['destination']
 
-      if message_destination
-        @logger.info "Sending alert to #{message_destination}."
-
-        options = { :source      => message_source,
-                    :destination => { :to_addresses => [ message_destination ] },
-                    :message     => { :subject => {
-                                        :data => "Alert: #{@name}"
-                                      },
-                                      :body    => {
-                                        :text => {
-                                          :data => @message_data
-                                        }
-                                      }
-                                    } 
-                  }
-        ses.send_email options
+      if @message_destination
+        @logger.info "Sending alert to #{@message_destination}."
+        ses.send_email email_options
       else
         @logger.info "Destination not set, no message sent."
       end
     end
 
+    def email_options
+      { :source      => @message_source,
+        :destination => { :to_addresses => [ @message_destination ] },
+        :message     => { :subject => {
+                            :data => "Alert: #{@message_subject}"
+                          },
+                          :body    => {
+                            :text => {
+                              :data => @message_data
+                            }
+                          }
+                        } 
+      }
+    end
+
     def process_message(message)
       begin
         message_body    = JSON.parse message
-        message         = JSON.parse message_body['Message']
+        message_details = JSON.parse message_body['Message']
       rescue JSON::ParserError => e
         @logger.error e.message
         return false
       end
 
-      @message_cause       = message['Cause']
-      @message_event       = message['Event']
-      @message_description = message['Description']
-      @message_data        = "#{@message_description} \n\n #{@message_cause}"
+      @message_cause       = message_details['Cause']
+      @message_event       = message_details['Event']
+      @message_description = message_details['Description']
+      @message_subject     = message_body['Subject']
+      @message_data        = "#{@name} received alert: \n\n #{@message_description} \n\n #{@message_cause}"
 
       true
     end

data/lib/aws-alert-monitor/version.rb

@@ -1,3 +1,3 @@
 module AwsAlertMonitor
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/alert_spec.rb

@@ -16,7 +16,7 @@ describe AwsAlertMonitor::Alert do
 
   it "should process the given message against known events" do
     @ses_mock.should_receive(:send_email)
-             .with({:source=>"brett_weaver@intuit.com", :destination=>{:to_addresses=>["brett_weaver@intuit.com"]}, :message=>{:subject=>{:data=>"Alert: test app"}, :body=>{:text=>{:data=>"Launching a new EC2 instance: i-d6a2cb8f \n\n At 2012-11-29T16:39:05Z an instance was started in response to a difference between desired and actual capacity, increasing the capacity from 0 to 1."}}}})
+             .with({:source=>"brett_weaver@intuit.com", :destination=>{:to_addresses=>["brett_weaver@intuit.com"]}, :message=>{:subject=>{:data=>"Alert: Auto Scaling: launch for group \"lc-pod-2-qa-1-app-1-Instances-XCYGCEQC0H02\""}, :body=>{:text=>{:data=>"test app received alert: \n\n Launching a new EC2 instance: i-d6a2cb8f \n\n At 2012-11-29T16:39:05Z an instance was started in response to a difference between desired and actual capacity, increasing the capacity from 0 to 1."}}}})
     @alert.process @options
   end
 

data/spec/config_spec.rb

@@ -4,6 +4,7 @@ require 'yaml'
 describe AwsAlertMonitor::Config do
   before do
     @data = "app:\n  access_key: key \n  secret_key: secret\n  region: us-west-1\n  sqs_endpoint: https://sqs.us-west-1.amazonaws.com/123456789012/app\n  events: \n    'autoscaling:EC2_INSTANCE_LAUNCH':\n      email:\n        source: brett_weaver@intuit.com\n        destination: brett_weaver@intuit.com\n"
+    File.stub :exists? => true
     File.should_receive(:open).
          with("#{ENV['HOME']}/.aws-alert-monitor.yml").
          and_return @data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-alert-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70164408200380 !ruby/object:Gem::Requirement
+  requirement: &70314215544440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164408200380
+  version_requirements: *70314215544440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70164408199440 !ruby/object:Gem::Requirement
+  requirement: &70314215543440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70164408199440
+  version_requirements: *70314215543440
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70164408198940 !ruby/object:Gem::Requirement
+  requirement: &70314215542860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70164408198940
+  version_requirements: *70314215542860
 description: I watch an SQS queue and escalate alert messages.
 email:
 - brett@weav.net
@@ -54,6 +54,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -91,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -86907863604503039
+      hash: -3329563464597490015
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -86907863604503039
+      hash: -3329563464597490015
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16