sensu-plugins-aws 3.0.0 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njk5MmJjMzA1ZDFhYTJjZmM5YjZiZDcxOWFkODdhMzY4MDc5YTc5Nw==
+    NWI2YzJmMzQ4ZWVkZTI4YjI0N2EzMTA5YWMwZjU4ODcxNTFkMTAyMA==
   data.tar.gz: !binary |-
-    Y2JhMGFkNTg5YzEwNTNkNDc5YzYyMzZlYjI2ZDExZGFkNWZhNTM4MQ==
+    ZjY3ZTk3ODIzODhhNzUwODI1ZmUzM2YzYWUxNDUzMzJlMDUzNWYyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTU1NjYzNWRiYjVkMTdhOGUxOTUwODI2NzJmMTdkZDk3YWJkZTM2YmMxMGNh
-    NjVjZTA2OTk3ZDRjMzc4NWRjZjI5OWJhZDRhNjBiOTYwMTgyNjIxMjgxOGRj
-    NTQ0ZjIzOTYyZWE0YmNiZjQ1NDBiNDE1OGVmNzc0MTA0Y2ZhYzQ=
+    NDQyYzk2ZDQ3OGQwOWVmY2Q3Njk3M2FlNzgxYTQzNjBjZjIzYTc5YjI0MTMz
+    YWI5NjM0MmZiODU5YTI0NTBlMDA5NWM0Y2I0NzQ1N2FkNzMzZTUzNDgyMDVk
+    MGU2MzJkOGUzMThmODZmYjNlZTg2OTA2M2U3N2EwODQzMjg3MTk=
   data.tar.gz: !binary |-
-    MWE4NThhNTEzNWNlMWMxMjhjNzY2ZDdjNDdmMGYxZjk3NjAzNjc5N2Q1N2Mx
-    ZWUwMzE3NTFiZmEzYzdjNGM3MmE5ZjM4ZGNkN2IxYTgyNmNlNGI3MDhhNGFk
-    Y2ViOWExMGU3MGQ4MGYxYmFmOWIzMDg0ZTlmOGMzMjA0ZTAyNTE=
+    ZDk3YmU4ZmM4OWEyOTRjMmVmNTI1MTc3Mzc4YTAwYTgzMzU4NzM4Y2VmZTQy
+    ZTc3YjNiYjQ3N2JmNGNjMDM4OTNmZmI4ODZlNWUxMzQ1ZWFiMzg4ODM4OTIy
+    MmJiYTg5MTU3MTZlNzA0ODhmNTFjNmE4NzIwMDlhYzlhYmE1MGY=

data/CHANGELOG.md

@@ -5,6 +5,21 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [3.1.0] - 2016-05-15
+### Fixed
+- check-instance-events.rb: Ignore completed instance-stop ec2 events
+- check-instance-events.rb: Ignore canceled system-maintenance ec2 events
+
+## Added
+- Added check-instance-reachability.rb: looks up all instances from a filter set and pings
+- Added check-route.rb: checks a route to an instance / eni on a route table
+- Added check-rds-pending.rb: checks for pending RDS maintenance events
+
+### Changed
+- handler-ec2_node.rb updated to allow configuration set from client config
+- metrics-ec2-filter.rb: Moved filter parsing to library
+- update to Rubocop 0.40 and cleanup
+
 ## [3.0.0] - 2016-05-05
 ### Removed
 - Support for Ruby 2.0
@@ -183,13 +198,14 @@ 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/3.0.0...HEAD
-[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.4.3...3.0.0
-[2.4.3]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.4.2...2.4.3
-[2.4.2]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.4.1...2.4.2
-[2.4.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.4.0...2.4.1
-[2.4.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.3.0...2.4.0
-[2.3.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.2.0...2.3.0
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.0.0...3.1.0
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.4.3...3.0.0
+[2.4.3]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.4.2...2.4.3
+[2.4.2]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.4.1...2.4.2
+[2.4.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.4.0...2.4.1
+[2.4.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.3.0...2.4.0
+[2.3.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.1.1...2.2.0
 [2.1.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.1.0...v2.1.1
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.0.1...2.1.0

data/README.md

@@ -62,6 +62,8 @@
 
 **check-rds-events.rb**
 
+**check-rds-pending.rb**
+
 **check-rds.rb**
 
 **check-redshift-events.rb**
@@ -84,6 +86,8 @@
 
 **check_vpc_vpn.py**
 
+**check-instances-count.rb**
+
 **check-vpc-vpn.rb**
 
 **handler-ec2_node.rb**
@@ -140,6 +144,7 @@
 * /bin/check-emr-steps.rb
 * /bin/check-instance-events.rb
 * /bin/check-rds-events.rb
+* /bin/check-rds-pending.rb
 * /bin/check-rds.rb
 * /bin/check-redshift-events.rb
 * /bin/check-s3-object.rb
@@ -153,6 +158,7 @@
 * /bin/handler-ses.rb
 * /bin/handler-sns.rb
 * /bin/metrics-autoscaling-instance-count.rb
+* /bin/check-instances-count.rb
 * /bin/metrics-ec2-count.rb
 * /bin/metrics-ec2-filter.rb
 * /bin/metrics-elasticache.rb

data/bin/check-autoscaling-cpucredits.rb

@@ -85,8 +85,7 @@ class CheckEc2CpuCredits < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def asg

data/bin/check-beanstalk-health.rb

@@ -0,0 +1,112 @@
+#! /usr/bin/env ruby
+#
+# check-beanstalk-health
+#
+# DESCRIPTION:
+#   This plugin checks the health of a beanstalk environment using
+#   the enhanced health reporting.
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-beanstalk-health -e MyAppEnv
+#
+# NOTES:
+#
+# LICENSE:
+#   Brendan Leon Gibat
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+require 'json'
+
+class BeanstalkHealth < Sensu::Plugin::Check::CLI
+  option :environment,
+         description: 'Application environment name',
+         short: '-e ENVIRONMENT_NAME',
+         long: '--environment ENVIRONMENT_NAME',
+         required: true
+
+  option :no_data_ok,
+         short: '-n',
+         long: '--allow-no-data',
+         description: 'Returns unknown if health status is Grey. If set to false this will critical on a Grey status.',
+         boolean: true,
+         default: true
+
+  def env_health
+    @env_health ||= beanstalk_client
+                    .describe_environment_health(
+                      environment_name: config[:environment],
+                      attribute_names: %w(Color Status HealthStatus Causes)
+                    )
+  end
+
+  def beanstalk_client
+    @beanstalk_client ||= Aws::ElasticBeanstalk::Client.new
+  end
+
+  def instances_health
+    @instances_health ||= begin
+      curr_instances = beanstalk_client.describe_instances_health(
+        environment_name: config[:environment],
+        attribute_names: %w(Color HealthStatus Causes)
+      )
+      instances = curr_instances.instance_health_list
+      until curr_instances.next_token.nil?
+        curr_instances = beanstalk_client.describe_instances_health(
+          environment_name: config[:environment],
+          attribute_names: %w(Color HealthStatus Causes)
+        )
+        instances.concat(curr_instances.instance_health_list)
+      end
+      instances
+    end
+  end
+
+  def unhealthy_instances
+    @unhealthy_instances ||= instances_health.select { |i| i.color != 'Green' }
+  end
+
+  def status_rollup
+    "Beanstalk Status: #{env_health.status}, Health Status: #{env_health.health_status}, Causes: #{env_health.causes.join(', ')}"
+  end
+
+  def unhealthy_instance_description(instance)
+    "instance id: #{instance.instance_id}, color: #{instance.color}, health status: #{instance.health_status}, causes: [#{instance.causes.join(', ')}]"
+  end
+
+  def unhealthy_instances_rollup
+    "Unhealthy instances and causes: [ #{unhealthy_instances.collect { |i| unhealthy_instance_description(i) }.join(', ')} ]"
+  end
+
+  def run
+    color = env_health.color
+    if color == 'Green'
+      ok
+    elsif color == 'Yellow'
+      warning "Environment status is YELLOW. #{status_rollup} #{unhealthy_instances_rollup}"
+    elsif color == 'Red'
+      critical "Environment status is RED. #{status_rollup} #{unhealthy_instances_rollup}"
+    elsif color == 'Grey'
+      if config[:no_data_ok]
+        unknown "Environment status is GREY. This means NO DATA. #{status_rollup}"
+      else
+        critical "Environment status is GREY. This means NO DATA. #{status_rollup}"
+      end
+    else
+      critical "Unknown Environment status response, #{color}"
+    end
+  end
+end

data/bin/check-certificate-expiry.rb

@@ -69,8 +69,7 @@ class CheckCertificateExpiry < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def aws_client(opts = {})

data/bin/check-cloudwatch-alarm.rb

@@ -73,8 +73,7 @@ class CloudWatchCheck < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/check-dynamodb-capacity.rb

@@ -99,8 +99,7 @@ class CheckDynamoDB < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def dynamo_db

data/bin/check-dynamodb-throttle.rb

@@ -94,8 +94,7 @@ class CheckDynamoDB < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def dynamo_db

data/bin/check-ec2-cpu_balance.rb

@@ -80,7 +80,8 @@ class EC2CpuBalance < Sensu::Plugin::Check::CLI
           name: 'instance-state-name',
           values: ['running']
         }
-      ])
+      ]
+    )
 
     messages = "\n"
     level = 0

data/bin/check-ec2-filter.rb

@@ -84,8 +84,7 @@ class EC2Filter < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def convert_operator

data/bin/check-ec2-network.rb

@@ -82,8 +82,7 @@ class CheckEc2Network < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def ec2

data/bin/check-elb-certs.rb

@@ -82,8 +82,7 @@ class CheckELBCerts < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

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

@@ -83,8 +83,7 @@ class ELBHealth < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

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

@@ -75,8 +75,7 @@ class ELBHealth < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def elb

data/bin/check-elb-latency.rb

@@ -90,8 +90,7 @@ class CheckELBLatency < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def elb

data/bin/check-elb-nodes.rb

@@ -90,8 +90,7 @@ class CheckELBNodes < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/check-elb-sum-requests.rb

@@ -82,8 +82,7 @@ class CheckELBSumRequests < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def elb

data/bin/check-emr-cluster.rb

@@ -90,8 +90,7 @@ class CheckEMRCluster < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def humanize(secs)

data/bin/check-instance-events.rb

@@ -63,8 +63,7 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run
@@ -91,7 +90,8 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
         #         "not_after": "2015-01-05 18:00:00 UTC"
         #     }
         # ]
-        useful_events = i[:events_set].reject { |x| x[:code] == 'system-reboot' && x[:description] =~ /\[Completed\]/ }
+        useful_events =
+          i[:events_set].reject { |x| (x[:code] == 'system-reboot' || x[:code] == 'instance-stop' || x[:code] == 'system-maintenance') && (x[:description] =~ /\[Completed\]/ || x[:description] =~ /\[Canceled\]/) }
         unless useful_events.empty?
           event_instances << i[:instance_id]
         end

data/bin/check-instance-reachability.rb

@@ -0,0 +1,107 @@
+#! /usr/bin/env ruby
+#
+# check-instance-reachability
+#
+# DESCRIPTION:
+#   This plugin looks up all instances from a filter set and pings
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   #YELLOW
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright (c) 2014, Leon Gibat, brendan.gibat@gmail.com
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+require 'sensu-plugins-aws'
+
+class CheckInstanceReachability < Sensu::Plugin::Check::CLI
+  include Common
+  include Filter
+
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default: 'us-east-1'
+
+  option :filter,
+         short: '-f FILTER',
+         long: '--filter FILTER',
+         description: 'String representation of the filter to apply',
+         default: '{}'
+
+  option :timeout,
+         description: 'Ping timeout in seconds',
+         short: '-t TIMEOUT',
+         long: '--timeout TIMEOUT',
+         default: 5,
+         proc: proc(&:to_i)
+
+  option :count,
+         description: 'Ping count',
+         short: '-c COUNT',
+         long: '--count COUNT',
+         default: 1,
+         proc: proc(&:to_i)
+
+  option :critical_response,
+         description: 'Flag if the response should error on failures',
+         short: '-r',
+         long: '--critical-response',
+         boolean: true,
+         default: false
+
+  def run
+    begin
+      aws_config
+      client = Aws::EC2::Client.new
+
+      filter = Filter.parse(config[:filter])
+
+      options = { filters: filter }
+
+      errors = []
+      instance_ids = []
+      data = client.describe_instances(options)
+
+      data[:reservations].each do |res|
+        res[:instances].each do |i|
+          instance_ids << i[:instance_id]
+          `ping -c #{config[:count]} -W #{config[:timeout]} #{i[:private_ip_address]}`
+          if $CHILD_STATUS.to_i > 0
+            errors << "Could not reach #{i[:instance_id]}"
+          end
+        end
+      end
+    rescue => e
+      puts "Error: exception: #{e}"
+      critical
+    end
+    if errors.empty?
+      ok "Instances checked: #{instance_ids.join(',')}"
+    else
+      message = errors.join(',')
+      if config[:critical_response]
+        critical message
+      else
+        warning message
+      end
+    end
+  end
+end

data/bin/check-instances-count.rb

@@ -0,0 +1,82 @@
+#! /usr/bin/env ruby
+#
+# check-instances-count
+#
+#
+# DESCRIPTION:
+#   This plugin checks the instances count for a specific auto scale group ( ASG ).
+#   Goal is to allow you to monitor that your ASG isnt out of control
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#     check-instances-count.rb --warn 15 --crit 25 --groupname logstash-instances-auto
+#
+#
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright (c) 2015, Kevin Bond
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugins-aws'
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+
+# Class to check the instance count
+class CheckInstanceCount < Sensu::Plugin::Check::CLI
+  include Common
+
+  option :groupname,
+         description: 'Name of the AutoScaling group',
+         short: '-g GROUP_NAME',
+         long: '--groupname GROUP_NAME',
+         required: true
+
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (such as us-east-1).',
+         default: 'us-east-1'
+
+  option :warn,
+         short: '-w COUNT',
+         long: '--warn COUNT',
+         proc: proc(&:to_i),
+         default: 15
+
+  option :crit,
+         short: '-c COUNT',
+         long: '--crit COUNT',
+         proc: proc(&:to_i),
+         default: 25
+
+  def instance_count
+    AWS::AutoScaling.new.groups[config[:groupname]].auto_scaling_instances.map(&:lifecycle_state).count('InService').to_i
+  rescue => e
+    critical "There was an error reaching AWS - #{e.message}"
+  end
+
+  def run
+    count = instance_count
+    msg_prefix = "#{count} instances running for ASG [ #{config[:groupname]} ]"
+    if count >= config[:crit]
+      critical "#{msg_prefix} - critical threshold #{config[:crit]}"
+    elsif count >= config[:warn]
+      warning "#{msg_prefix} - warning threshold #{config[:warn]}, critical threshold #{config[:crit]}"
+    else
+      ok msg_prefix
+    end
+  end
+end

data/bin/check-rds-events.rb

@@ -70,8 +70,7 @@ class CheckRDSEvents < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/check-rds-pending.rb

@@ -0,0 +1,67 @@
+#! /usr/bin/env ruby
+#
+# check-rds-events
+#
+#
+# DESCRIPTION:
+#   This plugin checks rds clusters for critical events.
+#   Due to the number of events types on RDS clusters the check searches for
+#   events containing the text string 'has started' or 'is being'.  These events all have
+#   accompanying completiion events and are impacting events
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#  ./check-rds-events.rb -r ${you_region}
+#
+# NOTES:
+#
+# LICENSE:
+#   Tim Smith <tim@cozy.co>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+
+class CheckRDSEvents < Sensu::Plugin::Check::CLI
+  include Common
+
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (such as eu-west-1).',
+         default: 'us-east-1'
+
+  def run
+    rds = Aws::RDS::Client.new
+
+    begin
+      # fetch all clusters identifiers
+      clusters = rds.describe_db_instances[:db_instances].map { |db| db[:db_instance_identifier] }
+      maint_clusters = []
+      # Check if there is any pending maintenance required
+      pending_record = rds.describe_pending_maintenance_actions(filters: [{ name: 'db-instance-id', values: clusters }])
+      pending_record[:pending_maintenance_actions].each do |response|
+        maint_clusters.push(response[:pending_maintenance_action_details])
+      end
+    rescue => e
+      unknown "An error occurred processing AWS RDS API: #{e.message}"
+    end
+
+    if maint_clusters.empty?
+      ok
+    else
+      critical("Clusters w/ pending maintenance required: #{maint_clusters.join(',')}")
+    end
+  end
+end

data/bin/check-rds.rb

@@ -124,8 +124,7 @@ class CheckRDS < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def rds

data/bin/check-redshift-events.rb

@@ -66,8 +66,7 @@ class CheckRedshiftEvents < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   # setup a redshift connection using aws-sdk

data/bin/check-route.rb

@@ -0,0 +1,122 @@
+#! /usr/bin/env ruby
+#
+# check-route
+#
+# DESCRIPTION:
+#   This plugin checks a route to an instance / eni on a route table
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   #YELLOW
+#
+# NOTES:
+#
+# LICENSE:
+#   Copyright (c) 2014, Leon Gibat, brendan.gibat@gmail.com
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+require 'sensu-plugins-aws'
+
+class CheckRoute < Sensu::Plugin::Check::CLI
+  include Common
+  include Filter
+
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default: 'us-east-1'
+
+  option :filter,
+         short: '-f FILTER',
+         long: '--filter FILTER',
+         description: 'String representation of the filter to apply',
+         default: '{}'
+
+  option :network_interface_id,
+         description: 'Network interface id of route',
+         short: '-n NETWORK_INTERFACE_ID',
+         long: '--network-interface-id NETWORK_INTERFACE_ID',
+         default: ''
+
+  option :instance_id,
+         description: 'Instance Id attachment of route',
+         short: '-i INSTANCE_ID',
+         long: '--instance-id INSTANCE_ID',
+         default: ''
+
+  option :destination_cidr_block,
+         description: 'Destination CIDR block of route',
+         short: '-d DESTINATION_CIDR',
+         long: '--destination-cidr DESTINATION_CIDR',
+         default: ''
+
+  option :gateway_id,
+         description: 'Gateway Id of route',
+         short: '-g GATEWAY_ID',
+         long: '--gateway-id GATEWAY_ID',
+         default: ''
+
+  option :state,
+         description: 'The route state. Can be either "active" or "blackhole"',
+         short: '-s STATE',
+         long: '--state STATE',
+         default: 'active'
+
+  option :vpc_peering_id,
+         description: 'VPC peering connection id',
+         short: '-v VPC_PEERING_ID',
+         long: '--vpc-peering-id VPC_PEERING_ID',
+         default: ''
+
+  def run
+    begin
+      aws_config
+      client = Aws::EC2::Client.new
+
+      filter = Filter.parse(config[:filter])
+
+      options = { filters: filter }
+
+      data = client.describe_route_tables(options)
+
+      data[:route_tables].each do |rt|
+        rt[:routes].each do |route|
+          checks = true
+          if config[:state] != route[:state]
+            checks = false
+          elsif !config[:vpc_peering_id].empty? && config[:vpc_peering_id] != route[:vpc_peering_connection_id]
+            checks = false
+          elsif !config[:gateway_id].empty? && config[:gateway_id] != route[:gateway_id]
+            checks = false
+          elsif !config[:destination_cidr_block].empty? && config[:destination_cidr_block] != route[:destination_cidr_block]
+            checks = false
+          elsif !config[:instance_id].empty? && config[:instance_id] != route[:instance_id]
+            checks = false
+          elsif !config[:network_interface_id].empty? && config[:network_interface_id] != route[:network_interface_id]
+            checks = false
+          end
+          if checks
+            ok
+          end
+        end
+      end
+    rescue => e
+      critical "Error: exception: #{e}"
+    end
+    critical
+  end
+end

data/bin/check-s3-bucket.rb

@@ -62,8 +62,7 @@ class CheckS3Bucket < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/check-s3-object.rb

@@ -87,8 +87,7 @@ class CheckS3Bucket < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run_check(type, age)

data/bin/check-sqs-messages.rb

@@ -95,8 +95,7 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/handler-ec2_node.rb

@@ -2,6 +2,8 @@
 #
 # CHANGELOG:
 # * 0.7.0:
+#   - Added method instance_id to check in client config section
+#     ['client']['aws']['instance_id'] first.
 #    - 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:
@@ -140,7 +142,7 @@ class Ec2Node < Sensu::Handler
     if ec2_node_should_be_deleted?
       delete_sensu_client!
     else
-      puts "[EC2 Node] #{@event['client']['name']} is in an invalid state"
+      puts "[EC2 Node] #{instance_id} is in an invalid state"
     end
   end
 
@@ -150,6 +152,18 @@ class Ec2Node < Sensu::Handler
     deletion_status(response)
   end
 
+  def instance_id
+    if @event['client'].key?('aws') && @event['client']['aws'].key?('instance_id')
+      @event['client']['aws']['instance_id']
+    else
+      @event['client']['name']
+    end
+  end
+
+  def instance_name
+    @event['client']['name']
+  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
@@ -160,7 +174,7 @@ class Ec2Node < Sensu::Handler
 
     begin
       # Finding the instance
-      instances = ec2.describe_instances(instance_ids: [@event['client']['name']]).reservations[0]
+      instances = ec2.describe_instances(instance_ids: [instance_id]).reservations[0]
       # If instance is empty/nil instance id is not valid so client can be deleted
       if instances.nil? || instances.empty?
         true

data/bin/metrics-autoscaling-instance-count.rb

@@ -63,8 +63,7 @@ class AutoScalingInstanceCountMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/metrics-ec2-count.rb

@@ -21,7 +21,7 @@
 # NOTES:
 #
 # LICENSE:
-#   Copyright (c) 2014, Tim Smith, tim@cozy.co
+#   Copyright (c) 2014, Tim Smith, tsmith@chef.io
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 #
@@ -63,8 +63,7 @@ class EC2Metrics < Sensu::Plugin::Metric::CLI::Graphite
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def by_instances_status(client)

data/bin/metrics-ec2-filter.rb

@@ -29,21 +29,11 @@
 
 require 'sensu-plugin/metric/cli'
 require 'aws-sdk'
-require 'sensu-plugins-aws/filter'
+require 'sensu-plugins-aws'
 
 class EC2Filter < Sensu::Plugin::Metric::CLI::Graphite
   include Filter
-  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']
-
-  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']
+  include Common
 
   option :aws_region,
          short: '-r AWS_REGION',
@@ -72,8 +62,7 @@ class EC2Filter < Sensu::Plugin::Metric::CLI::Graphite
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/metrics-elasticache.rb

@@ -87,8 +87,7 @@ class ElastiCacheMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/metrics-elb-full.rb

@@ -77,8 +77,7 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/metrics-elb.rb

@@ -89,8 +89,7 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def run

data/bin/metrics-sqs.rb

@@ -70,8 +70,7 @@ class SQSMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region]
-    }
+      region: config[:aws_region] }
   end
 
   def scheme(queue_name)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +229,7 @@ email: <sensu-users@googlegroups.com>
 executables:
 - check-autoscaling-cpucredits.rb
 - check-beanstalk-elb-metric.rb
+- check-beanstalk-health.rb
 - check-certificate-expiry.rb
 - check-cloudwatch-alarm.rb
 - check-cloudwatch-metric.rb
@@ -253,11 +254,15 @@ executables:
 - check-emr-steps.rb
 - check-instance-events.rb
 - check-instance-health.rb
+- check-instance-reachability.rb
+- check-instances-count.rb
 - check-kms-key.rb
 - check-rds-events.rb
+- check-rds-pending.rb
 - check-rds.rb
 - check-redshift-events.rb
 - check-reserved-instances.rb
+- check-route.rb
 - check-s3-bucket.rb
 - check-s3-object.rb
 - check-sensu-client.rb
@@ -290,6 +295,7 @@ files:
 - README.md
 - bin/check-autoscaling-cpucredits.rb
 - bin/check-beanstalk-elb-metric.rb
+- bin/check-beanstalk-health.rb
 - bin/check-certificate-expiry.rb
 - bin/check-cloudwatch-alarm.rb
 - bin/check-cloudwatch-metric.rb
@@ -314,11 +320,15 @@ files:
 - bin/check-emr-steps.rb
 - bin/check-instance-events.rb
 - bin/check-instance-health.rb
+- bin/check-instance-reachability.rb
+- bin/check-instances-count.rb
 - bin/check-kms-key.rb
 - bin/check-rds-events.rb
+- bin/check-rds-pending.rb
 - bin/check-rds.rb
 - bin/check-redshift-events.rb
 - bin/check-reserved-instances.rb
+- bin/check-route.rb
 - bin/check-s3-bucket.rb
 - bin/check-s3-object.rb
 - bin/check-sensu-client.rb