sensu-plugins-aws 2.1.1 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjA0M2U4MDE1M2U4N2Y3NGY0ODVjZDM3M2RlODNhYmY3MTFkZDI3YQ==
+    ZGMyOTMzMDljMzFjOTExZTdkZDhkOWNkOGUyN2I4ZjY1Yzk0MTRmNw==
   data.tar.gz: !binary |-
-    Mjc2NDdjYzliYjNlMzM0NzMwZWM3OTVmZTc4MjdhMDY3MjJiYWQ2Yw==
+    YzAyNzdkM2EwOWM0M2YzOTdjZGViOTMyMWRmMjg1Zjc4NGQ1OTEwNA==
 SHA512:
   metadata.gz: !binary |-
-    ODU0NzhhNjQwODg2ZTdmMmRhYWFhNDIxZTFlNTQ1OTcxYmZlMTlhNjMxZTFl
-    NzU2YjMyNmY3OGMzNTgyZjcwMmQzN2IzNzM1YTk0YTQxOTI4MjU0ZGY4OTcx
-    YTBjMTU2NjE3MzIyZWNiZDIxZTEzZDA1ZDk1NjZkNGE4YjE5Mzg=
+    ZGJhNjQ5ODEwZDZiMTUxNmFkOWQxNzZjODJjZGI2YmNlMDk2NGY3Zjc2YmQ3
+    ZDA1ZDQwNWE0Y2IxZTBhNzUwZjYyZDdkYzk3NzMxMzhkOWNkOTY3MzNlYTI2
+    OWYwYzBhZTVmMTFkNjU1MzU5Y2UyMjdlOTNmMDExZjg2MzE4OTg=
   data.tar.gz: !binary |-
-    M2MwMGNmZTBiYWUyYzAxMTkwMWI0ZGNjNmUzNDkxNTBjOTI1OGMzMjUxMzc0
-    OTUwNTM2NDhhMzAxN2I1YTgyNTUzODEwNDUzMzIzYjMyM2UyM2NjZWExMDJl
-    YzcyZTFjMWE4ODhkYTUzZTRmYzE2MmRlZjJiMjFkZDEyZDZkMWY=
+    NjE1NDA1Mzc0NjdlNDYxMWJjZWM5OWJjYzBlZDI4NGNjODMyOTI1OGQyYTFl
+    ZTllNzBkODViMWMyNzA0MzEyZDQwYjY4YjkzNTc4YTNmYTZlZTgwMWRkNTg4
+    ZjE1NjY2NmNhNThhZmU1YjIwODRhNjM0YzhjMDk3ODBlZGFhOTU=

data/CHANGELOG.md

@@ -3,7 +3,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## Unreleased
+## [Unreleased]
+
+## [2.2.0] - 2016-02-25
+### Added
+- check-ebs-snapshots.rb: added -i flag to ignore volumes with an IGNORE_BACKUP tag
+- check-sensu-client.rb Ensures that ec2 instances are registered with Sensu. 
+- check-trustedadvisor-service-limits.rb: New check for service limits based on Trusted Advisor API 
+- check-sqs-messages.rb,metrics-sqs.rb: Allow specifying queues by prefix with -p option
+- check-rds-events.rb: Add option to check a specific RDS instance
+- Add plugin check-elasticache-failover.rb that checks if an Elasticache node is in the primary state
+
+### Fixed
+- metrics-elasticache.rb: Gather node metrics when requested
 
 ## [2.1.1] - 2016-02-05
 ### Added
@@ -124,8 +136,9 @@ 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/2.1.1...HEAD
-[2.1.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.1.0...2.1.1
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.2.0...HEAD
+[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
 [2.0.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/1.2.0...2.0.0

data/README.md

@@ -30,6 +30,8 @@
 
 **check-eip-allocation.rb**
 
+**check-elasticache-failover.rb**
+
 **check-elb-certs.rb**
 
 **check-elb-health-fog.rb**
@@ -102,6 +104,7 @@
 * /bin/check-ebs-snapshots.rb
 * /bin/check-ec2-filter.rb
 * /bin/check-ec2-network.rb
+* /bin/check-elasticache-failover.rb
 * /bin/check-elb-certs.rb
 * /bin/check-elb-health-fog.rb
 * /bin/check-elb-health-sdk.rb

data/bin/check-ebs-snapshots.rb

@@ -18,8 +18,12 @@
 # USAGE:
 #   ./check-ebs-snapshots.rb -r ${you_region}
 #   ./check-ebs-snapshots.rb -r ${you_region} -p 1
+#   ./check-ebs-snapshots.rb -r ${you_region} -p -i
+#   ./check-ebs-snapshots.rb -r ${you_region} -i
 #
 # NOTES:
+#   When using -i flag any volume that has a tag-key of "IGNORE_BACKUP" will
+#   be ignored.
 #
 # LICENSE:
 #   Shane Starcher <shane.starcher@gmail.com>
@@ -45,11 +49,18 @@ class CheckEbsSnapshots < Sensu::Plugin::Check::CLI
          description: 'AWS region',
          default: 'us-east-1'
 
+  option :check_ignored,
+         short:       '-i',
+         long:        '--ignore',
+         description: 'mark as true to ignore volumes with an IGNORE_BACKUP tag',
+         default: false,
+         boolean: true
+
   def run
     errors = []
-    ec2 = Aws::EC2::Client.new
+    @ec2 = Aws::EC2::Client.new
 
-    volumes = ec2.describe_volumes(
+    volumes = @ec2.describe_volumes(
       filters: [
         {
           name: 'attachment.status',
@@ -61,11 +72,10 @@ class CheckEbsSnapshots < Sensu::Plugin::Check::CLI
         }
       ]
     )
-
     volumes[:volumes].each do |volume|
       tags = volume[:tags].map { |a| Hash[*a] }.reduce(:merge) || {}
-
-      snapshots = ec2.describe_snapshots(
+      next if config[:check_ignored] && tags.key?('IGNORE_BACKUP')
+      snapshots = @ec2.describe_snapshots(
         filters: [
           {
             name: 'volume-id',

data/bin/check-elasticache-failover.rb

@@ -0,0 +1,113 @@
+#! /usr/bin/env ruby
+#
+#   check-elasticache-failover.rb
+#
+# DESCRIPTION:
+#   Checks if specified ElastiCache node is `primary` state.
+#
+# OUTPUT:
+#   CheckElastiCacheFailover OK: Node `mynode-001` (in replication group `my-group-1`, node group `0001`) is `primary`.
+#   or
+#   CheckElastiCacheFailover CRITICAL: Node `mynode-001` (in replication group `my-group-1`, node group `0001`) is **not** `primary`.
+#
+# PLATFORMS:
+#   Linux, Windows, BSD, Solaris, etc
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: aws-sdk >= 2
+#
+# USAGE:
+#   check-elasticache-failover.rb --region <your region> --replication-group <yours> --node-group <yours> --primary-node <yours>
+#
+# NOTES:
+#
+# LICENSE:
+#   y13i <email@y13i.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/common'
+
+class CheckElastiCacheFailover < Sensu::Plugin::Check::CLI
+  VERSION = '0.0.1'.freeze
+
+  option :profile,
+         description: 'Profile name of AWS shared credential file entry.',
+         long:        '--profile PROFILE',
+         short:       '-p PROFILE'
+
+  option :aws_region,
+         description: 'AWS region.',
+         short:       '-r REGION',
+         long:        '--region REGION'
+
+  option :severity,
+         description: 'Critical or Warning.',
+         short:       '-s SEVERITY',
+         long:        '--severity SEVERITY',
+         proc:        :intern.to_proc,
+         default:     :critical
+
+  option :replication_group,
+         description: 'Replication group to check.',
+         long:        '--replication-group ID',
+         short:       '-g ID'
+
+  option :node_group,
+         description: 'Node group to check.',
+         long:        '--node-group ID',
+         short:       '-n ID'
+
+  option :primary_node,
+         description: 'Cluster name that should be primary.',
+         long:        '--primary-node NAME',
+         short:       '-c NAME'
+
+  include Common
+
+  def run
+    replication_group = elasticache.client.describe_replication_groups.replication_groups.find do |g|
+      g.replication_group_id == config[:replication_group]
+    end
+
+    unknown 'Replication group not found.' if replication_group.nil?
+
+    node_group = replication_group.node_groups.find do |g|
+      g.node_group_id == config[:node_group]
+    end
+
+    unknown 'Node group not found.' if node_group.nil?
+
+    node = node_group.node_group_members.find do |n|
+      n.cache_cluster_id == config[:primary_node]
+    end
+
+    unknown 'Node not found.' if node.nil?
+
+    message = "Node `#{config[:primary_node]}` (in replication group `#{config[:replication_group]}`, node group `#{config[:node_group]}`) is "
+
+    if node.current_role == 'primary'
+      message += '`primary`.'
+      ok message
+    else
+      message += '**not** `primary`.'
+      send config[:severity], message
+    end
+  end
+
+  private
+
+  def elasticache
+    return @elasticache if @elasticache
+
+    c = {}
+    c.update aws_config
+    c.update(profile: config[:profile]) if config[:profile]
+
+    @elasticache = Aws::ElastiCache::Resource.new(c)
+  end
+end

data/bin/check-rds-events.rb

@@ -23,7 +23,14 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#  ./check-rds-events.rb -r ${your_region} -k ${your_aws_secret_access_key} -a ${your_aws_access_key}
+#  Check's a specific RDS instance in a specific region for critical events
+#  check-rds-events.rb -r ${your_region} -k ${your_aws_secret_access_key} -a ${your_aws_access_key} -i ${your_rds_instance_id_name}
+#
+#  Checks all RDS instances in a specific region
+#  check-rds-events.rb -r ${your_region} -k ${your_aws_secret_access_key} -a ${your_aws_access_key}
+#
+#  Checks all RDS instances in a specific region, should be using IAM role
+#  check-rds-events.rb -r ${your_region}
 #
 # NOTES:
 #
@@ -55,6 +62,11 @@ class CheckRDSEvents < Sensu::Plugin::Check::CLI
          description: 'AWS Region (defaults to us-east-1).',
          default:     'us-east-1'
 
+  option :db_instance_id,
+         short:       '-i N',
+         long:        '--db-instance-id NAME',
+         description: 'DB instance identifier'
+
   def aws_config
     { access_key_id: config[:aws_access_key],
       secret_access_key: config[:aws_secret_access_key],
@@ -75,8 +87,18 @@ class CheckRDSEvents < Sensu::Plugin::Check::CLI
     rds = AWS::RDS::Client.new aws_config
 
     begin
-      # fetch all clusters identifiers
-      clusters = rds.describe_db_instances[:db_instances].map { |db| db[:db_instance_identifier] }
+      if !config[:db_instance_id].nil? && !config[:db_instance_id].empty?
+        db_instance = rds.describe_db_instances(db_instance_identifier: config[:db_instance_id])
+        if db_instance.nil? || db_instance.empty?
+          unknown "#{config[:db_instance_id]} instance not found"
+        else
+          clusters = [config[:db_instance_id]]
+        end
+      else
+        # fetch all clusters identifiers
+        clusters = rds.describe_db_instances[:db_instances].map { |db| db[:db_instance_identifier] }
+      end
+
       maint_clusters = []
 
       # fetch the last 15 minutes of events for each cluster
@@ -96,6 +118,7 @@ class CheckRDSEvents < Sensu::Plugin::Check::CLI
         cluster_name_long = "#{cluster_name} (#{aws_config[:region]}) #{events_record[:events][-1][:message]}"
         maint_clusters.push(cluster_name_long)
       end
+
     rescue => e
       unknown "An error occurred processing AWS RDS API: #{e.message}"
     end

data/bin/check-rds.rb

@@ -134,8 +134,8 @@ class CheckRDS < Sensu::Plugin::Check::CLI
   end
 
   def find_db_instance(id)
-    db = rds.describe_db_instances.db_instances.select { |db_instance| db_instance.db_instance_identifier == id }
-    unknown 'DB instance not found.' if db.empty?
+    db = rds.describe_db_instances.db_instances.detect { |db_instance| db_instance.db_instance_identifier == id }
+    unknown 'DB instance not found.' if db.nil?
     db
   end
 
@@ -146,7 +146,7 @@ class CheckRDS < Sensu::Plugin::Check::CLI
       dimensions: [
         {
           name: 'DBInstanceIdentifier',
-          value: @db_instance.id
+          value: @db_instance.db_instance_identifier
         }
       ],
       start_time: config[:end_time] - config[:period],
@@ -240,8 +240,8 @@ class CheckRDS < Sensu::Plugin::Check::CLI
   end
 
   def check_connections(severity, expected_lower_than)
-    @connections_metric ||= cloud_watch_metric 'DatabaseConnections'
-    @connections_metric_value ||= latest_value @connections_metric, 'Count'
+    @connections_metric ||= cloud_watch_metric 'DatabaseConnections', 'Count'
+    @connections_metric_value ||= latest_value @connections_metric
     return if @connections_metric_value < expected_lower_than
     flag_alert severity, "; DatabaseConnections are #{sprintf '%d', @connections_metric_value} (expected lower than #{expected_lower_than})"
   end

data/bin/check-sensu-client.rb

@@ -0,0 +1,175 @@
+#! /usr/bin/env ruby
+#
+# sensu-health-check
+#
+# DESCRIPTION:
+#   Finds a given tag set from EC2 and ensures sensu clients exist
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-sensu-client.rb -w 20 -f "{name:tag-value,values:[infrastructure]}"
+#   ./check-sensu-client.rb -w 20 -f "{name:tag-value,values:[infrastructure]}" -e '{Name:[Ignore, Bad.*]}'
+#   ./check-sensu-client.rb -w 20 -f "{name:tag-value,values:[infrastructure]}" -e '{Name:[Ignore, Bad.*]} {Sensu: [Ignore]}'
+#
+# NOTES:
+#  Values provided for the exclusion filter are treated as regex's for evaluation purposes. Any matching value
+#  will result in the instance being excluded
+#
+# LICENSE:
+#   Justin McCarty (jmccarty3@gmail.com)
+#   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'
+require 'net/http'
+require 'json'
+
+class CheckSensuClient < Sensu::Plugin::Check::CLI
+  include Filter
+  include Common
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (such as us-east-1).',
+         default: 'us-east-1'
+
+  option :sensu_host,
+         short: '-h SENSU_HOST',
+         long: '--host SENSU_HOST',
+         description: 'Sensu host to query',
+         default: 'sensu'
+
+  option :sensu_port,
+         short: '-p SENSU_PORT',
+         long: '--port SENSU_PORT',
+         description: 'Sensu API port',
+         proc: proc(&:to_i),
+         default: 4567
+
+  option :warn,
+         short: '-w WARN',
+         description: 'Warn if instance has been up longer (Minutes)',
+         proc: proc(&:to_i),
+         default: 0
+
+  option :critical,
+         short: '-c CRITICAL',
+         description: 'Critical if instance has been up longer (Minutes)',
+         proc: proc(&:to_i)
+
+  option :min,
+         short: '-m MIN_TIME',
+         description: 'Minimum Time an instance must be running (Minutes)',
+         proc: proc(&:to_i),
+         default: 5
+
+  option :filter,
+         short: '-f FILTER',
+         description: 'Filter to use to find ec2 instances',
+         default: '{}'
+
+  option :exclude_tags,
+         short: '-e {<tag-key>:[VAL1, VAL2]} {<tag-key>:[VAL1, VAL2] }',
+         long: '--exclude_tags {<tag-key>:[VAL1, VAL2] } {<tag-key>:[VAL1, VAL2] }',
+         description: 'Tag Values to exclude by. Values treated as regex. Any matching value will result in exclusion.',
+         default: '{}'
+
+  def run
+    # Converting the string into a hash.
+    filter_list = config[:exclude_tags].split(/}\s?{/).map do |x|
+      x.gsub(/[{}]/, '')
+    end
+    filter_list = filter_list.map do |y|
+      h1, h2 = y.split(':')
+      { h1 => h2 }
+    end.reduce(:merge)
+    filter_list.delete(nil)
+    filter_list.each { |x, y| filter_list[x] = y.strip.gsub(/[\[\]]/, '') }
+    client = Aws::EC2::Client.new aws_config
+
+    parsed_filter = Filter.parse(config[:filter])
+
+    filter = if parsed_filter.empty?
+               {}
+             else
+               { filters: parsed_filter }
+             end
+
+    data = client.describe_instances(filter)
+
+    current_time = Time.now.utc
+    aws_instances = Set.new
+    data.reservations.each do |r|
+      r.instances.each do |i|
+        aws_instances << {
+          id: i[:instance_id],
+          up_time: (current_time - i[:launch_time]) / 60,
+          tags: i.tags
+        }
+      end
+    end
+
+    sensu_clients = client_check
+
+    missing = Set.new
+
+    aws_instances.delete_if do |instance|
+      instance[:tags].any? do |key|
+        filter_list.keys.include?(key.key) && filter_list[key.key].split(',').any? do |v|
+          key.value.match(/#{v.strip}/)
+        end
+      end
+    end
+
+    aws_instances.each do |i|
+      if sensu_clients.include?(i[:id]) == false
+        if i[:up_time] > config[:min]
+          missing << i
+          output "Missing instance #{i[:id]}. Uptime: #{i[:up_time]} Minutes"
+        end
+      end
+    end
+
+    warn_flag = false
+    crit_flag = false
+
+    missing.each do |m|
+      if (config[:critical].nil? == false) && (m[:up_time] > config[:critical])
+        crit_flag = true
+      elsif (config[:warn].nil? == false) && (m[:up_time] > config[:warn])
+        warn_flag = true
+      end
+    end
+
+    if crit_flag
+      critical
+    elsif warn_flag
+      warning
+    end
+    ok
+  end
+
+  def client_check
+    uri = URI("http://#{config[:sensu_host]}:#{config[:sensu_port]}/clients")
+    response = JSON.parse(Net::HTTP.get(uri))
+
+    clients = Set.new
+    response.each do |client|
+      clients << client['name']
+    end
+
+    clients
+  end
+end

data/bin/check-sqs-messages.rb

@@ -16,8 +16,8 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   #YELLOW
-#
+#   check-sqs-messages -q my_queue -a key -k secret -w 500 -c 1000
+#   check-sqs-messages -p queue_prefix_ -a key -k secret -W 100 -C 50
 #
 # NOTES:
 #
@@ -56,7 +56,13 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
          short: '-q SQS_QUEUE',
          long: '--queue SQS_QUEUE',
          description: 'The name of the SQS you want to check the number of messages for',
-         required: true
+         default: ''
+
+  option :prefix,
+         short: '-p PREFIX',
+         long: '--prefix PREFIX',
+         description: 'The prefix of the queues you want to check the number of messages for',
+         default: ''
 
   option :warn_over,
          short: '-w WARN_OVER',
@@ -96,14 +102,46 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
   def run
     AWS.config aws_config
     sqs = AWS::SQS.new
-    messages = sqs.queues.named(config[:queue]).approximate_number_of_messages
 
-    if (config[:crit_under] >= 0 && messages < config[:crit_under]) || (config[:crit_over] >= 0 && messages > config[:crit_over])
-      critical "#{messages} message(s) in #{config[:queue]} queue"
-    elsif (config[:warn_under] >= 0 && messages < config[:warn_under]) || (config[:warn_over] >= 0 && messages > config[:warn_over])
-      warning "#{messages} message(s) in #{config[:queue]} queue"
+    if config[:prefix] == ''
+      if config[:queue] == ''
+        critical 'Error, either QUEUE or PREFIX must be specified'
+      end
+
+      messages = sqs.queues.named(config[:queue]).approximate_number_of_messages
+
+      if (config[:crit_under] >= 0 && messages < config[:crit_under]) || (config[:crit_over] >= 0 && messages > config[:crit_over])
+        critical "#{messages} message(s) in #{config[:queue]} queue"
+      elsif (config[:warn_under] >= 0 && messages < config[:warn_under]) || (config[:warn_over] >= 0 && messages > config[:warn_over])
+        warning "#{messages} message(s) in #{config[:queue]} queue"
+      else
+        ok "#{messages} messages in #{config[:queue]} queue"
+      end
     else
-      ok "#{messages} messages in #{config[:queue]} queue"
+      warn = false
+      crit = false
+      queues = []
+
+      sqs.queues.with_prefix(config[:prefix]).each do |q|
+        queue_name = q.arn.split(':').last
+        messages = q.approximate_number_of_messages
+
+        if (config[:crit_under] >= 0 && messages < config[:crit_under]) || (config[:crit_over] >= 0 && messages > config[:crit_over])
+          crit = true
+          queues << "#{messages} message(s) in #{queue_name} queue"
+        elsif (config[:warn_under] >= 0 && messages < config[:warn_under]) || (config[:warn_over] >= 0 && messages > config[:warn_over])
+          warn = true
+          queues << "#{messages} message(s) in #{queue_name} queue"
+        end
+      end
+
+      if crit
+        critical queues.to_s
+      elsif warn
+        warning queues.to_s
+      else
+        ok "All queues matching prefix '#{config[:prefix]}' OK"
+      end
     end
   end
 end

data/bin/check-trustedadvisor-service-limits.rb

@@ -0,0 +1,82 @@
+#! /usr/bin/env ruby
+#
+# check-trustedadvisor-service-limits
+#
+#
+# DESCRIPTION:
+#   This plugin uses Trusted Advisor API to perform check for
+#   service limits. Trigger 'critical' on sensu for services
+#   that are not 'Green'.
+#
+#   IAM requires AWSSupportAccess policy enabled.
+#
+#   https://aws.amazon.com/premiumsupport/ta-faqs/
+#
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk-v1
+#   gem: sensu-plugin
+#
+# USAGE:
+#  ./check-trustedadvisor-service-limits.rb -l {en|ja}
+#
+# NOTES:
+#
+# LICENSE:
+#   Seandy Wibowo <swibowo@sugarcrm.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+
+require 'sensu-plugin/check/cli'
+require 'sensu-plugins-aws'
+require 'aws-sdk'
+
+class CheckTrustedAdvisorServiceLimits < Sensu::Plugin::Check::CLI
+  include Common
+  option :aws_language,
+         short: '-l AWS_LANGUAGE',
+         long: '--aws-language AWS_LANGUAGE',
+         description: "ISO 639-1 language code to be used when querying Trusted Advisor API. Only 'en' and 'ja' supported for now",
+         default: 'en'
+
+  def run
+    # The Support endpoint seems to only available in us-east-1 region
+    # http://docs.aws.amazon.com/sdkforruby/api/Aws/Support.html
+    aws_support = Aws::Support::Client.new(region: 'us-east-1')
+
+    service_limit_msg = []
+
+    begin
+      # service limit check
+      # Perform a refresh to make sure the API result is not stale.
+      aws_support.refresh_trusted_advisor_check(check_id: 'eW7HH0l7J9')
+      sl = aws_support.describe_trusted_advisor_check_result(check_id: 'eW7HH0l7J9', language: config[:aws_language])
+
+      sl[:result][:flagged_resources].each do |slr|
+        # Data structure will be as follow
+        # ["<region>", "<service>", "<description>", "<limit>", "<usage>", "<status>"]
+        sl_region, sl_service, sl_description, sl_limit, sl_usage, sl_status = slr[:metadata]
+
+        next if sl_status == 'Green'
+        sl_usage = 0 if sl_usage.nil?
+
+        sl_msg = "#{sl_service} (#{sl_region}) #{sl_description} #{sl_usage} out of #{sl_limit}"
+        service_limit_msg.push(sl_msg)
+      end
+    rescue => e
+      unknown "An error occurred processing AWS TrustedAdvisor API: #{e.message}"
+    end
+
+    if service_limit_msg.empty?
+      ok
+    else
+      critical("Services hitting usage limit: #{service_limit_msg.join(', ')}")
+    end
+  end
+end

data/bin/metrics-elasticache.rb

@@ -98,6 +98,21 @@ class ElastiCacheMetrics < Sensu::Plugin::Metric::CLI::Graphite
                      config[:scheme]
                    end
 
+    dimensions = if config[:cachenodeid]
+                   [{
+                     'name' => 'CacheClusterId',
+                     'value' => config[:cacheclusterid]
+                   }, {
+                     'name' => 'CacheNodeId',
+                     'value' => config[:cachenodeid]
+                   }]
+                 else
+                   [{
+                     'name' => 'CacheClusterId',
+                     'value' => config[:cacheclusterid]
+                   }]
+                 end
+
     statistic_type = {
       'redis' => {
         'CPUUtilization' => 'Percent',
@@ -168,9 +183,7 @@ class ElastiCacheMetrics < Sensu::Plugin::Metric::CLI::Graphite
       options = {
         'namespace' => 'AWS/ElastiCache',
         'metric_name' => config[:metric],
-        'dimensions' => [
-          { 'name' => 'CacheClusterId', 'value' => config[:cacheclusterid] }
-        ],
+        'dimensions' => dimensions,
         'start_time' => st.iso8601,
         'end_time' => et.iso8601,
         'period' => 60,

data/bin/metrics-sqs.rb

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 #
-# sqs-metrics
+# metrics-sqs
 #
 # DESCRIPTION:
 #   Fetch SQS metrics
@@ -16,7 +16,8 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   sqs-metrics -q my_queue -a key -k secret
+#   metrics-sqs -q my_queue -a key -k secret
+#   metrics-sqs -p queue_prefix_ -a key -k secret
 #
 # NOTES:
 #
@@ -34,7 +35,13 @@ class SQSMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Name of the queue',
          short: '-q QUEUE',
          long: '--queue QUEUE',
-         required: true
+         default: ''
+
+  option :prefix,
+         description: 'Queue name prefix',
+         short: '-p PREFIX',
+         long: '--prefix PREFIX',
+         default: ''
 
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
@@ -67,19 +74,33 @@ class SQSMetrics < Sensu::Plugin::Metric::CLI::Graphite
     }
   end
 
-  def run
-    scheme = if config[:scheme] == ''
-               "aws.sqs.queue.#{config[:queue].tr('-', '_')}.message_count"
-             else
-               config[:scheme]
-             end
+  def scheme(queue_name)
+    "aws.sqs.queue.#{queue_name.tr('-', '_')}.message_count"
+  end
 
+  def run
     begin
       sqs = AWS::SQS.new aws_config
 
-      messages = sqs.queues.named(config[:queue]).approximate_number_of_messages
-      output scheme, messages
+      if config[:prefix] == ''
+        if config[:queue] == ''
+          critical 'Error, either QUEUE or PREFIX must be specified'
+        end
+
+        scheme = if config[:scheme] == ''
+                   scheme config[:queue]
+                 else
+                   config[:scheme]
+                 end
 
+        messages = sqs.queues.named(config[:queue]).approximate_number_of_messages
+        output scheme, messages
+      else
+        sqs.queues.with_prefix(config[:prefix]).each do |q|
+          queue_name = q.arn.split(':').last
+          output scheme(queue_name), q.approximate_number_of_messages
+        end
+      end
     rescue => e
       critical "Error fetching SQS queue metrics: #{e.message}"
     end

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

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

metadata

@@ -1,45 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURuakNDQW9hZ0F3SUJB
-  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJLTVJVd0V3WURWUVFEREF4elpX
-  NXoKZFMxd2JIVm5hVzR4SFRBYkJnb0praWFKay9Jc1pBRVpGZzF6Wlc1emRT
-  MXdiSFZuYVc1ek1SSXdFQVlLQ1pJbQppWlB5TEdRQkdSWUNhVzh3SGhjTk1U
-  WXdNakEwTWpNeU1qRTNXaGNOTVRjd01qQXpNak15TWpFM1dqQktNUlV3CkV3
-  WURWUVFEREF4elpXNXpkUzF3YkhWbmFXNHhIVEFiQmdvSmtpYUprL0lzWkFF
-  WkZnMXpaVzV6ZFMxd2JIVm4KYVc1ek1SSXdFQVlLQ1pJbWlaUHlMR1FCR1JZ
-  Q2FXOHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBdwpnZ0VLQW9J
-  QkFRQy9VUzNmdEkyUmQrOWQzS3JIQUw0bERsOGxhN2s2ZHA3K1RPY210VHd3
-  YzRiMUwzV0NyeEFoClpDWms1Q3k2aUpvWUd4VHVoNittSDJZZ3ExbHZGRE4v
-  NTh5YVRHTVFINzNRYVJjZjVnak9IMkJSQTlkUWRzWUgKYTNZYnMrbGxwVlYv
-  ZC9kMklaYyt2RU9tc21rTFpVeEhzZFdQSTZsWTBuYXJwU2RxNHNML0lXWWZP
-  aW1ocFFTWgpTV0t5WHg5cjM4UFpZZ0Q3djIydjloNTZkcUpQZFFPY29OODhF
-  NkE4YTdQWTcvL1RweWdTREtuSldudkFwS1JxCjNCN0xMaFNkOTRQMHdRcGow
-  MS9sb05Nd0FCMytGQjRRQ0UrdG1QeFYxZ1Q2ZWE4VW1SNjQrcGZKTFN0NGl5
-  N0gKVGc5OTdCZFZqaURJdG5SYzhCSXNjVFl4S2JRai9wTEhBZ01CQUFHamdZ
-  NHdnWXN3Q1FZRFZSMFRCQUl3QURBTApCZ05WSFE4RUJBTUNCTEF3SFFZRFZS
-  ME9CQllFRk5McjBmZ1BmdnlWK0VneEVGRHhVcVFhU2xScE1DZ0dBMVVkCkVR
-  UWhNQitCSFhObGJuTjFMWEJzZFdkcGJrQnpaVzV6ZFMxd2JIVm5hVzV6TG1s
-  dk1DZ0dBMVVkRWdRaE1CK0IKSFhObGJuTjFMWEJzZFdkcGJrQnpaVzV6ZFMx
-  d2JIVm5hVzV6TG1sdk1BMEdDU3FHU0liM0RRRUJCUVVBQTRJQgpBUUNQZTZ0
-  RUJ0NS9uQzk1aFhvS2VLRmhrWVc5bTE2aU5YdWRKeEorZGRYcnpDc2tEMXk2
-  ajZjQXY0a1FlUDFmClBIbDE4aDVrOWtKeElQU1IrcUkrK2JJbDE3ZUVPU096
-  YXNMbXdzdGFNU25NN3U1UWZMcFdFWTJldVZXQkRzdGQKMmhrcG80VSswSzVT
-  d3ptZEphMFdLQXRmS3ZkdENROGk5MllJUCtIODNFdXZDU0xwZ29aaDYzRXJx
-  dVFVY25lbgphZmg1bHVUQkExaTFjcUJHNEFNSjBmTFdHeU9xSmFYOFA5WnN4
-  RERXUEVCbk5TaVd2WGIrSUttSkFWTzF1VzRrClFOODNielZXU1d1bFk4Qlk2
-  a1grSVFNd1lhelpBbEIvMTNkN2E4VTBoN0NyYjM2Sm5TUGF0aHVSemU0cUtY
-  RlEKM2YzVFVaV3d2UmZ0Y1N1K3Z0Y0JSa00wCi0tLS0tRU5EIENFUlRJRklD
-  QVRFLS0tLS0K
-date: 2016-02-07 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -270,6 +239,7 @@ executables:
 - check-ec2-filter.rb
 - check-ec2-network.rb
 - check-eip-allocation.rb
+- check-elasticache-failover.rb
 - check-elb-certs.rb
 - check-elb-health-fog.rb
 - check-elb-health-sdk.rb
@@ -285,11 +255,12 @@ executables:
 - check-redshift-events.rb
 - check-s3-bucket.rb
 - check-s3-object.rb
+- check-sensu-client.rb
 - check-ses-limit.rb
 - check-sqs-messages.rb
+- check-trustedadvisor-service-limits.rb
 - check-vpc-nameservers.rb
 - check-vpc-vpn.rb
-- check_vpc_vpn.py
 - handler-ec2_node.rb
 - handler-ses.rb
 - handler-sns.rb
@@ -318,6 +289,7 @@ files:
 - bin/check-ec2-filter.rb
 - bin/check-ec2-network.rb
 - bin/check-eip-allocation.rb
+- bin/check-elasticache-failover.rb
 - bin/check-elb-certs.rb
 - bin/check-elb-health-fog.rb
 - bin/check-elb-health-sdk.rb
@@ -333,8 +305,10 @@ files:
 - bin/check-redshift-events.rb
 - bin/check-s3-bucket.rb
 - bin/check-s3-object.rb
+- bin/check-sensu-client.rb
 - bin/check-ses-limit.rb
 - bin/check-sqs-messages.rb
+- bin/check-trustedadvisor-service-limits.rb
 - bin/check-vpc-nameservers.rb
 - bin/check-vpc-vpn.rb
 - bin/check_vpc_vpn.py