sensu-plugins-aws 9.0.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2699fc4c1516d96d17ab77403d5e075a31004085
-  data.tar.gz: 8ceba90a9f7520263f2c7687244c6e1ff2440feb
+  metadata.gz: 00a5f6aca217d3a130aea8c8d73dde6db86bd936
+  data.tar.gz: 9e22380ee25815367496409e313fa851e398ca74
 SHA512:
-  metadata.gz: 4271137f66f70f6a6b42a2e83a93f3d82333e94f3a1346d41a79ae8744e008ee156d2baf5f8c58479eed55df439b5f20a9910c445401b1ff04d41f17290f8d40
-  data.tar.gz: b69bb4b2a860fe2adf24caa6f2e1815b960c21be8339c1fa54b170fdced41e53b365fa3fc812d63cd363a88493d523d08144324a3d7f644edecb6a8c4035f07c
+  metadata.gz: 4591894d2d5eff391c32379d82e9c23cc89acdee4f9bc61ae4829bb13450dd4e131cbfaad7f3cfc6cf09c15cd84b68a5f80a1fd3df9802543c934429736b889e
+  data.tar.gz: d8b4af39056d5e11140b46739a0a6d21adf9a866b99c697d943e33a7c43e225ff129319d69db80be00d00a69eea8081f78babf24a6bdcc40bcafd2933ee4fcf8

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [10.0.0] - 2017-10-24
+### Breaking Changes
+- handler-ses.rb, handler-sns.rb: Update to AWS-SDK v2. With the update to AWS-SDK v2 these handlers no longer take `access_key`, `secret_key`, or `use_ami_role` settings. Authentication should be configured per [here](https://github.com/sensu-plugins/sensu-plugins-aws/blob/master/README.md#authentication). (@eheydrick)
+
+### Changed
+- Update to `aws-sdk` 2.10 (@eheydrick)
+
 ## [9.0.1] - 2017-10-17
 ### Fixed
 - metrics-billing.rb: replace `-s` with `-S` for services definition to prevent conflict with scheme option (@boutetnico)
@@ -387,7 +394,8 @@ WARNING:  This release contains major breaking changes that will impact all user
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/9.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.0.0...HEAD
+[10.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/9.0.1...10.0.0
 [9.0.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/9.0.0...9.0.1
 [9.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/8.3.1...9.0.0
 [8.3.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/8.3.0...8.3.1

data/README.md

@@ -219,14 +219,25 @@
 ## Usage
 
 **handler-ses**
+
+1. Configure [authentication](#authentication)
+2. Enable the handler in `/etc/sensu/conf.d/handlers/ses.json`:
+```
+{
+  "handlers": {
+    "ses": {
+      "type": "pipe",
+      "command": "handler-ses.rb"
+    }
+  }
+}
+```
+3. Configure the handler in `/etc/sensu/conf.d/ses.json`:
 ```
 {
   "ses": {
     "mail_from": "sensu@example.com",
     "mail_to": "monitor@example.com",
-    "use_ami_role": true,
-    "access_key": "myaccesskey",
-    "secret_key": "mysecretkey",
     "region": "us-east-1",
     "subscriptions": {
       "subscription_name": {
@@ -238,13 +249,28 @@
 ```
 
 **handler-sns**
+
+`handler-sns` can be used to send alerts to Email, HTTP endpoints, SMS, or any other [subscription type](http://docs.aws.amazon.com/sns/latest/dg/welcome.html) supported by SNS.
+
+1. Create an SNS topic and subscription [[Docs]](http://docs.aws.amazon.com/sns/latest/dg/GettingStarted.html)
+1. Configure [authentication](#authentication)
+2. Enable the handler in `/etc/sensu/conf.d/handlers/sns.json`:
+```
+{
+  "handlers": {
+    "sns": {
+      "type": "pipe",
+      "command": "handler-sns.rb"
+    }
+  }
+}
+```
+3. Configure the handler in `/etc/sensu/conf.d/sns.json`:
 ```
 {
   "sns": {
     "topic_arn": "arn:aws:sns:us-east-1:111111111111:topic",
-    "use_ami_role": true,
-    "access_key": "MY_KEY",
-    "secret_key": "MY_secret"
+    "region": "us-east-1"
   }
 }
 ```

data/bin/handler-ses.rb

@@ -11,7 +11,7 @@
 # for details.
 
 require 'sensu-handler'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 class SESNotifier < Sensu::Handler
   def event_name
@@ -52,19 +52,6 @@ class SESNotifier < Sensu::Handler
     mail_to
   end
 
-  def use_ami_role
-    use_ami_role = settings['ses']['use_ami_role']
-    use_ami_role.nil? ? true : use_ami_role
-  end
-
-  def aws_access_key
-    settings['ses']['access_key'] || ''
-  end
-
-  def aws_access_secret
-    settings['ses']['secret_key'] || ''
-  end
-
   def region
     settings['ses']['region'] || 'us-east-1'
   end
@@ -88,23 +75,27 @@ class SESNotifier < Sensu::Handler
                 "#{action_to_string} - #{event_name}: #{@event['check']['notification']}"
               end
 
-    if use_ami_role
-      AWS.config(region: region)
-    else
-      AWS.config(access_key_id: aws_access_key,
-                 secret_access_key: aws_access_secret,
-                 region: region)
-    end
+    message = {
+      subject: {
+        data: subject
+      },
+      body: {
+        text: {
+          data: body
+        }
+      }
+    }
 
-    ses = AWS::SimpleEmailService.new
+    ses = Aws::SES::Client.new(region: region)
 
     begin
-      timeout 10 do
+      Timeout.timeout(10) do
         ses.send_email(
-          subject: subject,
-          from: mail_from,
-          to: [mail_to.split(',')],
-          body_text: body
+          source: mail_from,
+          destination: {
+            to_addresses: mail_to.split(',')
+          },
+          message: message
         )
 
         puts 'mail -- sent alert for ' + event_name + ' to ' + mail_to.to_s

data/bin/handler-sns.rb

@@ -1,20 +1,16 @@
 #!/usr/bin/env ruby
 #
-# This handler assumes it runs on an ec2 instance with an iam role
-# that has permission to send to the sns topic specified in the config.
-# This removes the requirement to specify an access key and secret access key.
-# See http://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html
+# Send notifications to an SNS topic
 #
 # Requires the aws-sdk gem.
 #
-# Setting required in sns.json
-#   topic_are  :  The arn for the destination sns topic
+# See README for usage information
 #
 # Released under the same terms as Sensu (the MIT license); see LICENSE
 # for details
 
 require 'sensu-handler'
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'erubis'
 
 class SnsNotifier < Sensu::Handler
@@ -30,19 +26,6 @@ class SnsNotifier < Sensu::Handler
     "#{@event['client']['name']}/#{@event['check']['name']}"
   end
 
-  def use_ami_role
-    use_ami_role = settings['sns']['use_ami_role']
-    use_ami_role.nil? ? true : use_ami_role
-  end
-
-  def aws_access_key
-    settings['sns']['access_key'] || ''
-  end
-
-  def aws_access_secret
-    settings['sns']['secret_key'] || ''
-  end
-
   def message
     template = if template_file && File.readable?(template_file)
                  File.read(template_file)
@@ -60,25 +43,21 @@ class SnsNotifier < Sensu::Handler
   end
 
   def handle
-    if use_ami_role
-      AWS.config(region: region)
-    else
-      AWS.config(access_key_id: aws_access_key,
-                 secret_access_key: aws_access_secret,
-                 region: region)
-    end
-
-    sns = AWS::SNS.new
-
-    t = sns.topics[topic_arn]
+    sns = Aws::SNS::Client.new(region: region)
 
     subject = if @event['action'].eql?('resolve')
                 "RESOLVED - [#{event_name}]"
               else
                 "ALERT - [#{event_name}]"
               end
-    options = { subject: subject }
-    t.publish("#{subject} - #{message}", options)
+
+    options = {
+      subject: subject,
+      message: "#{subject} - #{message}",
+      topic_arn: topic_arn
+    }
+
+    sns.publish(options)
   rescue => e
     puts "Exception occured in SnsNotifier: #{e.message}", e.backtrace
   end

data/lib/sensu-plugins-aws/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsAWS
   module Version
-    MAJOR = 9
+    MAJOR = 10
     MINOR = 0
-    PATCH = 1
+    PATCH = 0
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 10.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement