sensu-plugins-aws 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 207ae0c8a468edf766ab233945bee9bb6046b85f
-  data.tar.gz: 90e1e84ba225762c306219b60b545495c9e2639a
+  metadata.gz: 2efbcaa411b6ef7da6f0c0217d3949b8a94ecce0
+  data.tar.gz: 908abecb23899de8f95741c7fbc515031ec9d149
 SHA512:
-  metadata.gz: 7246d4d4da7a7d74d7121ce334d0e228afc7667a9b6ae98b485f05a0d029308729430d87a6af0da77b4133dd14a993d008ed8bd0394f886930fcdf6b15e34349
-  data.tar.gz: 7cf1528e5c8126f2e92e30210562ed12f23ac42fadf9384b4eb3acb60d167b894b3e408ae073820ad03d3597178b39696e772db4eaeb7341391a20d9d29bdfec
+  metadata.gz: 9735551c5d5a0117dcfab9709ddf7a572cb0ebef73bb079bf0f1e450c81d805dd744a4dbb3454ba51b21e6f7b24d8dc5172452b4ee67b49deb343218c4966ba0
+  data.tar.gz: 69fe7444c11198923d7d4ec4f63f03ba3109997eccc62c0a8ed132183a8d8badaac129864cf83f7c973bb59e92409f786a5de754c1036aafdd6b0a5ed63a1493

data/CHANGELOG.md

@@ -5,6 +5,27 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [2.1.0] - 2016-01-15
+### Added
+- check-elb-health-sdk.rb: add option for warning instead of critical when unhealthy instances are found
+- check-rds.rb: add M4 instances
+- handler-sns.rb: add option to use a template to render body mail
+- check-rds-events.rb: add RDS event message to output
+- Added check-cloudwatch-metric that checks the values of cloudwatch metrics
+- Added check-beanstalk-elb-metric that checks an ELB used in a Beanstalk environment
+- Added check-certificate-expiry that checks the expiration date of certificates loaded into IAM
+- Added test cases for check-certificate-expiry.rb
+
+### Changed
+- handler-ec2_node.rb: Update to new API event naming and simplifying ec2_node_should_be_deleted method and fixing match that will work with any user state defined, also improved docs
+- metrics-elb-full.rb: flush hash in-between iterations
+- check-ses-limit.rb: move to AWS-SDK v2, use common module, return unknown on empty responses
+
+### Fixed
+- metrics-memcached.rb: Fixed default scheme
+- Fix typo in cloudwatch comparison check
+
+## [2.0.1] - 2015-11-03
 ### Changed
 - pinned all dependencies
 - set gemspec to require > `2.0.0`

data/README.md

@@ -11,6 +11,10 @@
 
 **check-autoscaling-cpucredits.rb**
 
+**check-beanstalk-elb-metric.rb**
+
+**check-certificate-expiry.rb**
+
 **check-cloudwatch-alarm**
 
 **check-dynamodb-capacity.rb**
@@ -87,6 +91,8 @@
 ## Files
 
 * /bin/check-autoscaling-cpucredits.rb
+* /bin/check-beanstalk-elb-metric.rb
+* /bin/check-certificate-expiry.rb
 * /bin/check-cloudwatch-alarm.rb
 * /bin/check-dynamodb-capacity.rb
 * /bin/check-dynamodb-throttle.rb

data/bin/check-beanstalk-elb-metric.rb

@@ -0,0 +1,123 @@
+#! /usr/bin/env ruby
+#
+# check-beanstalk-elb-metric
+#
+# DESCRIPTION:
+#   This plugin finds the desired ELB in a beanstalk environment and queries
+#   for the requested cloudwatch metric for that ELB
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-beanstalk-elb-metric -e MyAppEnv -m Latency -c 100
+#
+# NOTES:
+#
+# LICENSE:
+#   Andrew Matheny
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugins-aws/cloudwatch-common'
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+
+class BeanstalkELBCheck < Sensu::Plugin::Check::CLI
+  option :environment,
+         description: 'Application environment name',
+         short: '-e ENVIRONMENT_NAME',
+         long: '--environment ENVIRONMENT_NAME',
+         required: true
+
+  option :elb_idx,
+         description: 'Index of ELB.  Useful for multiple ELB environments',
+         short: '-i ELB_NUM',
+         long: '--elb-idx ELB_NUM',
+         default: 0,
+         proc: proc(&:to_i)
+
+  option :metric_name,
+         description: 'ELB CloudWatch Metric',
+         short: '-m METRIC_NAME',
+         long: '--metric METRIC_NAME',
+         required: true
+
+  option :period,
+         description: 'CloudWatch metric statistics period. Must be a multiple of 60',
+         short: '-p N',
+         long: '--period SECONDS',
+         default: 60,
+         proc: proc(&:to_i)
+
+  option :statistics,
+         short: '-s N',
+         long: '--statistics NAME',
+         default: 'Average',
+         description: 'CloudWatch statistics method'
+
+  option :unit,
+         short: '-u UNIT',
+         long: '--unit UNIT',
+         description: 'CloudWatch metric unit'
+
+  option :critical,
+         description: 'Trigger a critical when value is over VALUE',
+         short: '-c VALUE',
+         long: '--critical VALUE',
+         proc: proc(&:to_f),
+         required: true
+
+  option :warning,
+         description: 'Trigger a critical when value is over VALUE',
+         short: '-w VALUE',
+         long: '--warning VALUE',
+         proc: proc(&:to_f)
+
+  option :compare,
+         description: 'Comparision operator for threshold: equal, not, greater, less',
+         short: '-o OPERATION',
+         long: '--opertor OPERATION',
+         default: 'greater'
+
+  option :no_data_ok,
+         short: '-n',
+         long: '--allow-no-data',
+         description: 'Returns ok if no data is returned from the metric',
+         boolean: true,
+         default: false
+
+  include CloudwatchCommon
+
+  def metric_desc
+    @metric_desc ||= "BeanstalkELB/#{config[:environment]}/#{elb_name}/#{config[:metric_name]}"
+  end
+
+  def elb_name
+    @elb_name ||= Aws::ElasticBeanstalk::Client.new
+                  .describe_environment_resources(environment_name: config[:environment])
+                  .environment_resources
+                  .load_balancers[config[:elb_idx]]
+                  .name
+  end
+
+  def run
+    new_config = config.clone
+    new_config[:namespace] = 'AWS/ELB'
+    new_config[:dimensions] = [
+      {
+        name: 'LoadBalancerName',
+        value: elb_name
+      }
+    ]
+    check new_config
+  end
+end

data/bin/check-certificate-expiry.rb

@@ -0,0 +1,124 @@
+#! /usr/bin/env ruby
+#
+# check-certificate-expiry
+#
+# DESCRIPTION:
+#   Checks expiration date on certificate. If no certificate is passed it checks
+#   all certs in account.  Will use default provider if no access key and secret are passed
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-certificate-expiry.rb --server-certificate-name ${cert_name} --warning 45 --critical 30
+#
+# NOTES:
+#   Based heavily on Yohei Kawahara's check-ec2-network
+#
+# LICENSE:
+#   Zach Bintliff <zbintliff@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+
+class CheckCertificateExpiry < Sensu::Plugin::Check::CLI
+  option :aws_access_key,
+         short:       '-a AWS_ACCESS_KEY',
+         long:        '--aws-access-key AWS_ACCESS_KEY',
+         description: "AWS Access Key. Either set ENV['AWS_ACCESS_KEY'] or provide it as an option. Uses Default Credential if none are passed",
+         default:     ENV['AWS_ACCESS_KEY']
+
+  option :aws_secret_access_key,
+         short:       '-k AWS_SECRET_KEY',
+         long:        '--aws-secret-access-key AWS_SECRET_KEY',
+         description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_KEY'] or provide it as an option. Uses Default Credential if none are passed",
+         default:     ENV['AWS_SECRET_KEY']
+
+  option :aws_region,
+         short:       '-r AWS_REGION',
+         long:        '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default:     'us-east-1'
+
+  option :server_certificate_name,
+         short:       '-n CERTIFICATE_NAME',
+         long:        '--server-certificate-name CERTIFICATE_NAME',
+         description: 'Certificate to check. Checks all if not passed'
+
+  option :warning,
+         short:       '-w N',
+         long:        '--warning VALUE',
+         description: 'Issue a warning if the Cert will expire in under VALUE days'
+
+  option :critical,
+         short:       '-c N',
+         long:        '--critical VALUE',
+         description: 'Issue a critical if the Cert will expire in under VALUE days',
+         default:      0
+
+  def aws_config
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
+  end
+
+  def aws_client(opts = {})
+    config = aws_config.merge(opts)
+    @aws_client ||= Aws::IAM::Client.new config
+  end
+
+  def get_cert(cert_name)
+    aws_client.get_server_certificate(server_certificate_name: cert_name).server_certificate.server_certificate_metadata
+  end
+
+  def check_expiry(cert, reportstring, warnflag, critflag)
+    expiration = cert.expiration.gmtime
+    current_time = Time.now.gmtime
+    time_to_expiry = (expiration - current_time).to_i / (24 * 60 * 60) ## Seconds to days, integer division
+
+    if time_to_expiry <= config[:critical].to_i
+      critflag = true
+      if time_to_expiry < 1
+        reportstring += " #{cert.server_certificate_name} certificate is expired!"
+      else
+        reportstring += " #{cert.server_certificate_name} certificate expires in #{time_to_expiry} days;"
+      end
+    elsif time_to_expiry <= config[:warning].to_i
+      warnflag = true
+      reportstring += " #{cert.server_certificate_name} certificate expires in #{time_to_expiry} days;"
+    end
+    [reportstring, warnflag, critflag]
+  end
+
+  def run
+    warnflag = false
+    critflag = false
+    reportstring = ''
+    if config[:server_certificate_name].nil?
+      aws_client.list_server_certificates.server_certificate_metadata_list.each do |cert|
+        reportstring, warnflag, critflag = check_expiry(cert, reportstring, warnflag, critflag)
+      end
+    else
+      reportstring, warnflag, critflag = check_expiry(get_cert(config[:server_certificate_name]), reportstring, warnflag, critflag)
+    end
+
+    if critflag
+      critical reportstring
+    elsif warnflag
+      warning reportstring
+    else
+      ok 'All checked Certificates are ok'
+    end
+  end
+end

data/bin/check-cloudwatch-metric.rb

@@ -0,0 +1,117 @@
+#! /usr/bin/env ruby
+#
+# check-cloudwatch-metric
+#
+# DESCRIPTION:
+#   This plugin retrieves the value of a cloudwatch metric and triggers
+#   alarms based on the thresholds specified
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-cloudwatch-metric -n CPUUtilization -d InstanceId=i-12345678,AvailabilityZone=us-east-1a -c 90
+#
+# NOTES:
+#
+# LICENSE:
+#   Andrew Matheny
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugins-aws/cloudwatch-common'
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+
+class CloudWatchMetricCheck < Sensu::Plugin::Check::CLI
+  option :namespace,
+         description: 'CloudWatch namespace for metric',
+         short: '-n NAME',
+         long: '--namespace NAME',
+         default: 'AWS/EC2'
+
+  option :metric_name,
+         description: 'Metric name',
+         short: '-m NAME',
+         long: '--metric NAME',
+         required: true
+
+  option :dimensions,
+         description: 'Comma delimited list of DimName=Value',
+         short: '-d DIMENSIONS',
+         long: '--dimensions DIMENSIONS',
+         proc: proc { |d| CloudWatchMetricCheck.parse_dimensions d },
+         default: ''
+
+  option :period,
+         description: 'CloudWatch metric statistics period. Must be a multiple of 60',
+         short: '-p N',
+         long: '--period SECONDS',
+         default: 60,
+         proc: proc(&:to_i)
+
+  option :statistics,
+         short: '-s N',
+         long: '--statistics NAME',
+         default: 'Average',
+         description: 'CloudWatch statistics method'
+
+  option :unit,
+         short: '-u UNIT',
+         long: '--unit UNIT',
+         description: 'CloudWatch metric unit'
+
+  option :critical,
+         description: 'Trigger a critical when value is over VALUE',
+         short: '-c VALUE',
+         long: '--critical VALUE',
+         proc: proc(&:to_f),
+         required: true
+
+  option :warning,
+         description: 'Trigger a critical when value is over VALUE',
+         short: '-w VALUE',
+         long: '--warning VALUE',
+         proc: proc(&:to_f)
+
+  option :compare,
+         description: 'Comparision operator for threshold: equal, not, greater, less',
+         short: '-o OPERATION',
+         long: '--opertor OPERATION',
+         default: 'greater'
+
+  option :no_data_ok,
+         short: '-n',
+         long: '--allow-no-data',
+         description: 'Returns ok if no data is returned from the metric',
+         boolean: true,
+         default: false
+
+  include CloudwatchCommon
+
+  def self.parse_dimensions(dimension_string)
+    dimension_string.split(',')
+      .collect { |d| d.split '=' }
+      .collect { |a| { name: a[0], value: a[1] } }
+  end
+
+  def dimension_string
+    config[:dimensions].map { |d| "#{d[:name]}=#{d[:value]}" }.join('&')
+  end
+
+  def metric_desc
+    "#{config[:namespace]}-#{config[:metric_name]}(#{dimension_string})"
+  end
+
+  def run
+    check config
+  end
+end

data/bin/check-elb-health-sdk.rb

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 #
 # check-elb-health-sdk
-# Last Update: 1/22/2015 by bkett
-# ===
 #
 # DESCRIPTION:
 #   This plugin checks the health of an Amazon Elastic Load Balancer or all ELBs in a given region.
@@ -17,6 +15,11 @@
 #   gem: aws-sdk-v1
 #   gem: sensu-plugin
 #
+# USAGE:
+#   check-elb-health-sdk.rb -r region
+#   check-elb-health-sdk.rb -r region -n my-elb
+#   check-elb-health-sdk.rb -r region -n my-elb -i instance1,instance2
+#
 # Copyright (c) 2015, Benjamin Kett <bkett@umn.edu>
 #
 # Released under the same terms as Sensu (the MIT license); see LICENSE
@@ -63,6 +66,12 @@ class ELBHealth < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :warn_only,
+         short: '-w',
+         long: '--warn-only',
+         description: 'Warn instead of critical when unhealthy instances are found',
+         default: false
+
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
@@ -113,7 +122,11 @@ class ELBHealth < Sensu::Plugin::Check::CLI
       end
     end
     if critical
-      critical @message
+      if config[:warn_only]
+        warning @message
+      else
+        critical @message
+      end
     else
       ok @message
     end

data/bin/check-elb-nodes.rb

@@ -17,11 +17,11 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   Warning if any load balancer's latency is over 1 second, critical if over 3 seconds.
-#   check-elb-latency --warning-over 1 --critical-over 3
+#   Warning if the load balancer has 3 or fewer healthy nodes and critical if 2 or fewer
+#   check-elb-nodes --warn 3 --crit 2
 #
-#   Critical if "app" load balancer's latency is over 5 seconds, maximum of last one hour
-#   check-elb-latency --elb-names app --critical-over 5 --statistics maximum --period 3600
+#   Warning if the load balancer has 50% or less healthy nodes and critical if 25% or less
+#   check-elb-nodes --warn_perc 50 --crit_perc 25
 #
 # NOTES:
 #

data/bin/check-rds-events.rb

@@ -64,7 +64,7 @@ class CheckRDSEvents < Sensu::Plugin::Check::CLI
     if clusters.empty?
       ok
     else
-      critical("Clusters w/ critical events: #{clusters.join(',')}")
+      critical("Clusters w/ critical events: #{clusters.join(', ')}")
     end
   end
 
@@ -82,7 +82,8 @@ class CheckRDSEvents < Sensu::Plugin::Check::CLI
         next if events_record[:events].empty?
 
         # if the last event is a start maint event then the cluster is still in maint
-        maint_clusters.push(cluster_name) if events_record[:events][-1][:message] =~ /has started|is being|off-line|shutdown/
+        cluster_name_long = "#{cluster_name} (#{aws_config[:region]}) #{events_record[:events][-1][:message]}"
+        maint_clusters.push(cluster_name_long) if events_record[:events][-1][:message] =~ /has started|is being|off-line|shutdown/
       end
     rescue => e
       unknown "An error occurred processing AWS RDS API: #{e.message}"

data/bin/check-rds.rb

@@ -172,24 +172,29 @@ class CheckRDS < Sensu::Plugin::Check::CLI
 
   def memory_total_bytes(instance_class)
     memory_total_gigabytes = {
-      'db.t1.micro'    => 0.615,
+      'db.cr1.8xlarge' => 244.0,
       'db.m1.small'    => 1.7,
+      'db.m1.medium'   => 3.75,
+      'db.m1.large'    => 7.5,
+      'db.m1.xlarge'   => 15.0,
+      'db.m2.xlarge'   => 17.1,
+      'db.m2.2xlarge'  => 34.2,
+      'db.m2.4xlarge'  => 68.4,
       'db.m3.medium'   => 3.75,
       'db.m3.large'    => 7.5,
       'db.m3.xlarge'   => 15.0,
       'db.m3.2xlarge'  => 30.0,
+      'db.m4.large'    => 8.0,
+      'db.m4.xlarge'   => 16.0,
+      'db.m4.2xlarge'  => 32.0,
+      'db.m4.4xlarge'  => 64.0,
+      'db.m4.10xlarge' => 160.0,
       'db.r3.large'    => 15.0,
       'db.r3.xlarge'   => 30.5,
       'db.r3.2xlarge'  => 61.0,
       'db.r3.4xlarge'  => 122.0,
       'db.r3.8xlarge'  => 244.0,
-      'db.m2.xlarge'   => 17.1,
-      'db.m2.2xlarge'  => 34.2,
-      'db.m2.4xlarge'  => 68.4,
-      'db.cr1.8xlarge' => 244.0,
-      'db.m1.medium'   => 3.75,
-      'db.m1.large'    => 7.5,
-      'db.m1.xlarge'   => 15.0,
+      'db.t1.micro'    => 0.615,
       'db.t2.micro'    => 1,
       'db.t2.small'    => 2,
       'db.t2.medium'   => 4,

data/bin/check-ses-limit.rb

@@ -16,6 +16,7 @@
 # DEPENDENCIES:
 #   gem: aws-sdk
 #   gem: sensu-plugin
+#   gem: sensu-plugins-aws
 #
 # USAGE:
 #   #YELLOW
@@ -29,20 +30,20 @@
 #
 
 require 'sensu-plugin/check/cli'
-require 'aws/ses'
+require 'sensu-plugins-aws'
+require 'aws-sdk'
 
 class CheckSESLimit < Sensu::Plugin::Check::CLI
+  include Common
   option :aws_access_key,
          short: '-a AWS_ACCESS_KEY',
          long: '--aws-access-key AWS_ACCESS_KEY',
-         description: "AWS Access Key. Either set ENV['AWS_ACCESS_KEY'] or provide it as an option",
-         default: ENV['AWS_ACCESS_KEY']
+         description: 'AWS Access Key ID.'
 
   option :aws_secret_access_key,
          short: '-k AWS_SECRET_KEY',
          long: '--aws-secret-access-key AWS_SECRET_KEY',
-         description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_KEY'] or provide it as an option",
-         default: ENV['AWS_SECRET_KEY']
+         description: 'AWS Secret Access Key.'
 
   option :aws_region,
          short: '-r AWS_REGION',
@@ -64,33 +65,25 @@ class CheckSESLimit < Sensu::Plugin::Check::CLI
          default: 90,
          proc: proc(&:to_i)
 
-  def aws_config
-    { access_key_id: config[:aws_access_key],
-      secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
-  end
-
   def run
     begin
-      ses = AWS::SES::Base.new aws_config
-
-      response = ses.quota
-    rescue AWS::SES::ResponseError => e
-      critical "An issue occured while communicating with the AWS SES API: #{e.message}"
+      ses = Aws::SES::Client.new
+      response = ses.get_send_quota
+    rescue => e
+      unknown "An issue occured while communicating with the AWS SES API: #{e.message}"
     end
 
-    unless response.empty? # rubocop: disable Style/GuardClause
-      percent = (response.sent_last_24_hours.to_i / response.max_24_hour_send.to_i) * 100
-      message = "SES sending limit is at #{percent}%"
+    unknown 'Empty response from AWS SES API' if response.empty? # Can this happen?
+
+    percent = (response.sent_last_24_hours.to_i / response.max_24_hour_send.to_i) * 100
+    message = "SES sending limit is at #{percent}%"
 
-      if config[:crit_percent] > 0 && config[:crit_percent] <= percent
-        critical message
-      elsif config[:warn_percent] > 0 && config[:warn_percent] <= percent
-        warning message
-      else
-        ok message
-      end
+    if config[:crit_percent] > 0 && config[:crit_percent] <= percent
+      critical message
+    elsif config[:warn_percent] > 0 && config[:warn_percent] <= percent
+      warning message
+    else
+      ok message
     end
   end
 end

data/bin/handler-ec2_node.rb

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 #
 # CHANGELOG:
+# * 0.7.0:
+#    - Update to new API event naming and simplifying ec2_node_should_be_deleted method and fixing
+#      match that will work with any user state defined.
 # * 0.6.0:
 #   - Fixed ec2_node_should_be_deleted to account for an empty insances array
 # * 0.5.0:
@@ -32,6 +35,22 @@
 # to match any state reason `.*` Regardless, eventually a client will be
 # deleted once AWS stops responding that the instance id exists.
 #
+# You could specify a ec2_states.json config file for the states like so:
+#
+#  {
+#   "ec2_node": {
+#    "ec2_states": [
+#     "terminated",
+#     "stopping",
+#     "shutting-down",
+#     "stopped"
+#     ]
+#    }
+#  }
+#
+# And add that to your /etc/sensu/conf.d directory.
+# If you do not specify any states the handler would not work
+#
 # NOTE: The implementation for correlating Sensu clients to EC2 instances may
 # need to be modified to fit your organization. The current implementation
 # assumes that Sensu clients' names are the same as their instance IDs in EC2.
@@ -81,7 +100,7 @@
 #             "name": "keepalive",
 #             "status": 2
 #           },
-#           "occurences": "eval: value > 2"
+#           "occurrences": "eval: value > 2"
 #         }
 #       }
 #     },
@@ -114,7 +133,10 @@ class Ec2Node < Sensu::Handler
 
   def filter; end
 
+  # Method handle
   def handle
+    # Call ec2_node_should_be_deleted method and check for instance state and if valid delete from the sensu API otherwise
+    # instance is in invalid state
     if ec2_node_should_be_deleted?
       delete_sensu_client!
     else
@@ -122,23 +144,46 @@ class Ec2Node < Sensu::Handler
     end
   end
 
+  # Method to delete client from sensu API
   def delete_sensu_client!
     response = api_request(:DELETE, '/clients/' + @event['client']['name']).code
     deletion_status(response)
   end
 
+  # Method to check if there is any insance and if instance is in a valid state that could be deleted
   def ec2_node_should_be_deleted?
+    # Defining region for aws SDK object
     ec2 = Aws::EC2::Client.new(region: region)
-    states = @event['client']['ec2_states'] || settings['ec2_node']['ec2_states'] || ['shutting-down', 'terminated', 'stopping', 'stopped']
+    # Check if attributes or json objects are not defined
+    if @event['client']['ec2_states'].nil? && settings['ec2_node']['ec2_states'].nil?
+      puts 'ec2_states is not define, please add the attributes or create a json config file with valid states keys'
+    else
+      # Asigning valid states
+      instance_states = @event['client']['ec2_states'] || settings['ec2_node']['ec2_states'] || ['shutting-down', 'terminated', 'stopping', 'stopped']
+    end
+
     begin
+      # Finding the instance
       instances = ec2.describe_instances(instance_ids: [@event['client']['name']]).reservations[0]
+      # If instance is empty/nil instance id is not valid so client can be deleted
       if instances.nil? || instances.empty?
         true
       else
-        instance = instances.instances[0]
-        state_reason = instance.state_reason.nil? ? nil : instance.state_reason.code
-        state = instance.state.name
-        states.include?(state) && state_reasons.any? { |reason| Regexp.new(reason) =~ state_reason }
+        # Checking for instance state and reason, and if matches any of the user defined or default reasons then
+        # method returns True
+
+        # Returns Instance object
+        instance_obj = instances.instances[0]
+        # Returns instance state reason in AWS i.e: "Client.UserInitiatedShutdown"
+        instance_state_reason = instance_obj.state_reason.code
+        # Returns the instance state i.e: "terminated"
+        instance_state = instance_obj.state.name
+        # Defining the default reasons why an instance could be deleted or not
+        instance_default_reasons = %w(Client.UserInitiatedShutdown Server.SpotInstanceTermination Client.InstanceInitiatedShutdown)
+        # If user specified a reason use those otherwise use default
+        instance_reasons = @event['client']['ec2_state_reasons'] || settings['ec2_node']['ec2_state_reasons'] || instance_default_reasons
+        # Return true is instance state and instance reason is valid
+        instance_states.include?(instance_state) && instance_reasons.include?(instance_state_reason)
       end
     rescue Aws::EC2::Errors::InvalidInstanceIDNotFound
       true
@@ -160,12 +205,6 @@ class Ec2Node < Sensu::Handler
     end
   end
 
-  def state_reasons
-    default_reasons = %w('UserInitiatedShutdown', 'SpotInstanceTermination', 'InstanceInitiatedShutdown')
-    reasons = @event['client']['ec2_state_reasons'] || settings['ec2_node']['ec2_state_reasons'] || default_reasons
-    @state_reasons ||= reasons.each { |reason| Regexp.new(reason) }
-  end
-
   def deletion_status(code)
     case code
     when '202'

data/bin/handler-sns.rb

@@ -15,6 +15,7 @@
 
 require 'sensu-handler'
 require 'aws-sdk-v1'
+require 'erubis'
 
 class SnsNotifier < Sensu::Handler
   def topic_arn
@@ -43,7 +44,19 @@ class SnsNotifier < Sensu::Handler
   end
 
   def message
-    @event['check']['notification'] || @event['check']['output']
+    if template_file && File.readable?(template_file)
+      template = File.read(template_file)
+    else
+      template = <<-BODY.gsub(/^\s+/, '')
+        <%= @event['check']['notification'] || @event['check']['output'] %>
+      BODY
+    end
+    eruby = Erubis::Eruby.new(template)
+    eruby.result(binding)
+  end
+
+  def template_file
+    settings['sns']['template_file']
   end
 
   def handle

data/bin/metrics-elasticache.rb

@@ -16,7 +16,8 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   #YELLOW
+#   elasticache-metrics.rb -n rediscluster -c redis -a key -k secret
+#   elasticache-metrics.rb -n memcachedcluster -c memcached -a key -k secret
 #
 # NOTES:
 #   Redis: http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CacheMetrics.Redis.html
@@ -92,7 +93,7 @@ class ElastiCacheMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def run
     if config[:scheme] == ''
-      graphitepath = "#{config[:elasticachename]}.#{config[:metric].downcase}"
+      graphitepath = "elasticache.#{config[:cacheclusterid]}"
     else
       graphitepath = config[:scheme]
     end

data/bin/metrics-elb-full.rb

@@ -116,16 +116,13 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
         'end_time' => et.iso8601,
         'period' => 60
       }
-
-      result = {}
-
       config[:elbname].split(',').each do |elbname|
         if config[:scheme] == ''
           graphitepath = "#{elbname}"
         else
           graphitepath = "#{config[:scheme]}.#{elbname}"
         end
-
+        result = {}
         statistic_type.each do |key, value|
           options['metric_name'] = key
           options['dimensions'][0]['value'] = elbname

data/lib/sensu-plugins-aws/cloudwatch-common.rb

@@ -0,0 +1,62 @@
+require 'aws-sdk'
+
+module CloudwatchCommon
+  def client
+    Aws::CloudWatch::Client.new
+  end
+
+  def read_value(resp, stats)
+    resp.datapoints.first.send(stats.downcase)
+  end
+
+  def resp_has_no_data(resp, stats)
+    resp.datapoints.nil? || resp.datapoints.length == 0 || resp.datapoints.first.nil? || read_value(resp, stats).nil?
+  end
+
+  def compare(value, threshold, compare_method)
+    if compare_method == 'greater'
+      return value > threshold
+    elsif compare_method == 'less'
+      return value < threshold
+    elsif compare_method == 'not'
+      return value != threshold
+    else
+      return value == threshold
+    end
+  end
+
+  def metrics_request(config)
+    {
+      namespace: config[:namespace],
+      metric_name: config[:metric_name],
+      dimensions: config[:dimensions],
+      start_time: Time.now - config[:period] * 10,
+      end_time: Time.now,
+      period: config[:period],
+      statistics: [config[:statistics]],
+      unit: config[:unit]
+    }
+  end
+
+  def check(config)
+    resp = client.get_metric_statistics(metrics_request(config))
+
+    no_data = resp_has_no_data(resp, config[:statistics])
+    if no_data && config[:no_data_ok]
+      ok "#{metric_desc} returned no data but that's ok"
+    elsif no_data && !config[:no_data_ok]
+      unknown "#{metric_desc} could not be retrieved"
+    end
+
+    value = read_value(resp, config[:statistics])
+    base_msg = "#{metric_desc} is #{value}: comparison=#{config[:compare]}"
+
+    if compare value, config[:critical], config[:compare]
+      critical "#{base_msg} threshold=#{config[:critical]}"
+    elsif config[:warning] && compare(value, config[:warning], config[:compare])
+      warning "#{base_msg} threshold=#{config[:warning]}"
+    else
+      ok "#{base_msg}, will alarm at #{!config[:warning].nil? ? config[:warning] : config[:critical]}"
+    end
+  end
+end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -102,6 +102,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +247,7 @@ description: |-
                                 for monitoring and metrics collection, including:
                                 health and metrics for various AWS services, such
                                 as EC2, RDS, ELB, and more, as well as handlers
-                                for EC2, SES, and SNS
+                                for EC2, SES, and SNS.
 email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-sqs.rb
@@ -246,6 +260,7 @@ executables:
 - handler-sns.rb
 - handler-ses.rb
 - handler-ec2_node.rb
+- check_vpc_vpn.py
 - check-vpc-vpn.rb
 - check-vpc-nameservers.rb
 - check-sqs-messages.rb
@@ -270,7 +285,10 @@ executables:
 - check-ebs-snapshots.rb
 - check-dynamodb-throttle.rb
 - check-dynamodb-capacity.rb
+- check-cloudwatch-metric.rb
 - check-cloudwatch-alarm.rb
+- check-certificate-expiry.rb
+- check-beanstalk-elb-metric.rb
 - check-autoscaling-cpucredits.rb
 extensions: []
 extra_rdoc_files: []
@@ -279,7 +297,10 @@ files:
 - LICENSE
 - README.md
 - bin/check-autoscaling-cpucredits.rb
+- bin/check-beanstalk-elb-metric.rb
+- bin/check-certificate-expiry.rb
 - bin/check-cloudwatch-alarm.rb
+- bin/check-cloudwatch-metric.rb
 - bin/check-dynamodb-capacity.rb
 - bin/check-dynamodb-throttle.rb
 - bin/check-ebs-snapshots.rb
@@ -316,6 +337,7 @@ files:
 - bin/metrics-elb.rb
 - bin/metrics-sqs.rb
 - lib/sensu-plugins-aws.rb
+- lib/sensu-plugins-aws/cloudwatch-common.rb
 - lib/sensu-plugins-aws/common.rb
 - lib/sensu-plugins-aws/filter.rb
 - lib/sensu-plugins-aws/version.rb