sensu-plugins-aws 2.2.0 → 2.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGMyOTMzMDljMzFjOTExZTdkZDhkOWNkOGUyN2I4ZjY1Yzk0MTRmNw==
+    MjZiZDczN2YwYTQ3NTkzZGYwYTNmYjY0ODg4MzA0NTJlYTlmODNlMQ==
   data.tar.gz: !binary |-
-    YzAyNzdkM2EwOWM0M2YzOTdjZGViOTMyMWRmMjg1Zjc4NGQ1OTEwNA==
+    NGNmMjZjMzZiN2YwYjNmOTA3OGZmZjE1MWVlYjU1ZDljZTk4NTMxNg==
 SHA512:
   metadata.gz: !binary |-
-    ZGJhNjQ5ODEwZDZiMTUxNmFkOWQxNzZjODJjZGI2YmNlMDk2NGY3Zjc2YmQ3
-    ZDA1ZDQwNWE0Y2IxZTBhNzUwZjYyZDdkYzk3NzMxMzhkOWNkOTY3MzNlYTI2
-    OWYwYzBhZTVmMTFkNjU1MzU5Y2UyMjdlOTNmMDExZjg2MzE4OTg=
+    NGY2MjMxZTdlYmNhNzk1NzUzZjQ5YWE5MGIyYzNhMGNlYTdmOTM4MzBkNWEx
+    NTkwZDI5NDlhZTQ3OWI0N2RmZTc3ZTA1NjE4Y2IxY2I4ZDNhNTdhNDg0ZWFj
+    NTE0NTY5N2RhNDc5ZTkyZWFhZmE0ZjRlMmIzN2M5YWY4NzJmODY=
   data.tar.gz: !binary |-
-    NjE1NDA1Mzc0NjdlNDYxMWJjZWM5OWJjYzBlZDI4NGNjODMyOTI1OGQyYTFl
-    ZTllNzBkODViMWMyNzA0MzEyZDQwYjY4YjkzNTc4YTNmYTZlZTgwMWRkNTg4
-    ZjE1NjY2NmNhNThhZmU1YjIwODRhNjM0YzhjMDk3ODBlZGFhOTU=
+    MzQ0YWU2MjE2NWMyYmM1NWM0OGFhMjg5ZjlhYmUwN2RkZjFiMjJjMGQ3NDdl
+    YTY1N2ZhMzJlMzE5ZWRjMzRhMDVjYTk1NWE1NzQyYTU5MDRmZWU5NDVkODUy
+    YmQwYzRlZjFkM2UzNDA2YTNmYjBjYzc3NzhiZWYyMDRlMDhmODE=

data/CHANGELOG.md

@@ -5,11 +5,22 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.3.0] - 2016-03-18
+### Added
+- Implemented metrics for EMR cluster steps
+- Implemented check for EMR cluster failed steps
+
+### Changed
+- Update to aws-sdk 2.2.28
+
+### Fixed
+- check-cloudwatch-metric.rb: removed invalid .length.empty? check
+
 ## [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-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
@@ -136,7 +147,8 @@ WARNING:  This release contains major breaking changes that will impact all user
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/2.3.0...HEAD
+[2.3.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/v2.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

@@ -48,6 +48,8 @@
 
 **check-emr-cluster.rb**
 
+**check-emr-steps.rb**
+
 **check-instance-events.rb**
 
 **check-instance-health.rb**
@@ -90,6 +92,8 @@
 
 **metrics-elb.rb**
 
+**metrics-emr-steps.rb**
+
 **metrics-sqs.rb**
 
 
@@ -113,6 +117,7 @@
 * /bin/check-elb-nodes.rb
 * /bin/check-elb-sum-requests.rb
 * /bin/check-emr-cluster.rb
+* /bin/check-emr-steps.rb
 * /bin/check-instance-events.rb
 * /bin/check-rds-events.rb
 * /bin/check-rds.rb
@@ -132,6 +137,7 @@
 * /bin/metrics-elasticache.rb
 * /bin/metrics-elb-full.rb
 * /bin/metrics-elb.rb
+* /bin/metrics-emr-steps.rb
 * /bin/metrics-sqs.rb
 
 ## Usage

data/bin/check-emr-steps.rb

@@ -0,0 +1,78 @@
+#! /usr/bin/env ruby
+#
+# check-emr-steps
+#
+# DESCRIPTION:
+#   Alerts on any failed steps for a cluster in the past 10 minutes.
+#
+# OUTPUT:
+#   plain-text
+#
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   check-emr-steps.rb -r us-west-2 -b 'My Cluster'
+#
+#   This will alert on any failed steps in the past 10 minutes on the latest cluster
+#   with the name 'My Cluster'.
+# NOTES:
+#
+# LICENSE:
+#   Bryan Absher <bryan.absher@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+
+require 'sensu-plugins-aws'
+require 'sensu-plugin/metric/cli'
+require 'aws-sdk'
+
+class CheckEMRSteps < Sensu::Plugin::Metric::CLI::Graphite
+  include Common
+
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: 'sensu.aws.emr'
+
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default: 'us-east-1'
+
+  option :cluster_name,
+         short: '-b CLUSTER_NAME',
+         long: '--cluster-name',
+         description: 'The name of the EMR cluster',
+         required: true
+
+  def run
+    emr = Aws::EMR::Client.new(aws_config)
+    begin
+      emr_clusters = emr.list_clusters.clusters
+      clusters = emr_clusters.select { |c| c.name == config[:cluster_name] }
+      critical "EMR cluster #{config[:cluster_name]} not found" if clusters.empty?
+      cluster = clusters.sort_by { |c| c.status.timeline.creation_date_time }.reverse.first
+
+      steps = emr.list_steps(
+        cluster_id: cluster.id,
+        step_states: ['FAILED']
+      ).steps
+
+      messages = []
+      now = Time.new
+      failed = steps.select { |step| now - step.status.timeline.end_date_time < 10 * 60 }
+      failed.each_entry { |step| messages << "Step #{step.id} '#{step.name}' has failed on cluster #{cluster.id} '#{cluster.name}'" }
+
+      if messages.count > 0
+        critical("#{messages.count} #{messages.count > 1 ? 'steps have' : 'step has'} failed: #{messages.join(',')}")
+      else
+        ok
+      end
+    end
+  end
+end

data/bin/check-instance-events.rb

@@ -22,7 +22,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.
 #

data/bin/check-rds-events.rb

@@ -35,7 +35,7 @@
 # NOTES:
 #
 # LICENSE:
-#   Tim Smith <tim@cozy.co>
+#   Tim Smith <tsmith@chef.io>
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 #

data/bin/check-redshift-events.rb

@@ -29,7 +29,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.
 #

data/bin/metrics-emr-steps.rb

@@ -0,0 +1,81 @@
+#! /usr/bin/env ruby
+#
+# metrics-emr-steps
+#
+# DESCRIPTION:
+#   Lists steps in EMR cluster queue with their status.
+#
+# OUTPUT:
+#   plain-text
+#
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   metric-emr-steps.rb -r us-west-2 -b 'prod lateral train'
+#
+#   This will list out the counts for each step status for the entire history of the cluster.
+#
+# NOTES:
+#
+# LICENSE:
+#   Bryan Absher <bryan.absher@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+
+require 'sensu-plugins-aws'
+require 'sensu-plugin/metric/cli'
+require 'aws-sdk'
+
+class EMRStepMetrics < Sensu::Plugin::Metric::CLI::Graphite
+  include Common
+
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-s SCHEME',
+         long: '--scheme SCHEME',
+         default: 'sensu.aws.emr'
+
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default: 'us-east-1'
+
+  option :cluster_name,
+         short: '-b CLUSTER_NAME',
+         long: '--cluster-name',
+         description: 'The name of the EMR cluster',
+         required: true
+
+  def count(steps, status)
+    steps.count { |step| step.status.state == status }
+  end
+
+  STATUS = %w(PENDING RUNNING COMPLETED CANCELLED FAILED INTERRUPTED).freeze
+
+  def cluster_steps(emr, cluster_id, data)
+    steps = emr.list_steps(
+      cluster_id: cluster_id
+    ).steps
+    STATUS.each_entry { |s| data[s] += count(steps, s) }
+  end
+
+  def run
+    emr = Aws::EMR::Client.new(aws_config)
+    begin
+      emr_clusters = emr.list_clusters.clusters
+      clusters = emr_clusters.select { |c| c.name == config[:cluster_name] }
+      critical "EMR cluster #{config[:cluster_name]} not found" if clusters.empty?
+      cluster = clusters.sort_by { |c| c.status.timeline.creation_date_time }.reverse.first
+      data = {}
+      STATUS.each_entry { |status| data[status] = 0 }
+      cluster_steps(emr, cluster.id, data)
+      safe_name = config[:cluster_name].tr(' ', '_')
+      STATUS.each_entry { |status| output config[:scheme] + '.' + safe_name + '.step.' + status, data[status] }
+    end
+    ok
+  end
+end

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

@@ -10,7 +10,7 @@ module CloudwatchCommon
   end
 
   def resp_has_no_data(resp, stats)
-    resp.datapoints.nil? || resp.datapoints.length.empty? || resp.datapoints.first.nil? || read_value(resp, stats).nil?
+    resp.datapoints.nil? || resp.datapoints.empty? || resp.datapoints.first.nil? || read_value(resp, stats).nil?
   end
 
   def compare(value, threshold, compare_method)

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

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
     MAJOR = 2
-    MINOR = 2
+    MINOR = 3
     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: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.28
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ executables:
 - check-elb-nodes.rb
 - check-elb-sum-requests.rb
 - check-emr-cluster.rb
+- check-emr-steps.rb
 - check-instance-events.rb
 - check-instance-health.rb
 - check-rds-events.rb
@@ -270,6 +271,7 @@ executables:
 - metrics-elasticache.rb
 - metrics-elb-full.rb
 - metrics-elb.rb
+- metrics-emr-steps.rb
 - metrics-sqs.rb
 extensions: []
 extra_rdoc_files: []
@@ -298,6 +300,7 @@ files:
 - bin/check-elb-nodes.rb
 - bin/check-elb-sum-requests.rb
 - bin/check-emr-cluster.rb
+- bin/check-emr-steps.rb
 - bin/check-instance-events.rb
 - bin/check-instance-health.rb
 - bin/check-rds-events.rb
@@ -321,6 +324,7 @@ files:
 - bin/metrics-elasticache.rb
 - bin/metrics-elb-full.rb
 - bin/metrics-elb.rb
+- bin/metrics-emr-steps.rb
 - bin/metrics-sqs.rb
 - lib/sensu-plugins-aws.rb
 - lib/sensu-plugins-aws/cloudwatch-common.rb