sensu-plugins-aws 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c485509a9d40dee7713b4225ede97470a3f0cefb
-  data.tar.gz: 9e8c41bcc8f9694fd3703b3c76d6707f381fe69a
+  metadata.gz: ffd1f6a42abd1a5201a34df72564a7774a7f3c29
+  data.tar.gz: 38cf5c5cc6c757dcef503d825c50938ef02f2158
 SHA512:
-  metadata.gz: d28050bd2fe7ca47eca3d4117217d53bd3a5f4670d3aa8fc266a9cbee270047a658a57a4a8ffdee241001d9a5e09db0c0bf4a8c2da87e45d0c3be48d34962b66
-  data.tar.gz: 9edec98c9020e813eefe61855430aa79e68fab69af5a6ff683ee92c6a0dbd397a217c4f284ec182728f9a72fa0809f6f29ba5a5f0cd23ab90362f4ed5970ccb4
+  metadata.gz: c56ed6c76d340f357509aae2676c0b0a1aac1ebff884aa71d50b3332207887c70102255885ea4359a320fbd7dc8bec463e0002baa23aaa35e6894e93a2176d72
+  data.tar.gz: ca41201cc25e0ba58658c5bdedf4717c6d8150fdcd5fd8f0d790ce4f8f4dacfe3f7fd6eea3cbb8996347cdb754be8104ae95ab6842c5212af3f2ec5e25bf10f4

data/CHANGELOG.md

@@ -5,6 +5,20 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [4.1.0] - 2017-05-01
+###  Added
+- check-cloudwatch-composite-metric.rb: Allow calculation of percentage for cloudwatch metrics  by composing two metrics (@cornelf) (numerator_metric/denominator_metric * 100) as a percentage. This is useful to skip pushing such metrics to graphite in order to get the percentage metric computed.
+- check-cloudwatch-composite-metric.rb: protect against zero division errors (@cornelf)
+- check-sqs-messages.rb now supports specifying multiple queues wihtout a prefix (@majormoses)
+- check-asg-instances-created.rb is a new check that allows looking at the number od instances created in the last hour (@phoppe93)
+
+### Changed
+- check-sns-subscriptions.rb improved error messages (@obazoud)
+
+### Fixed
+- lib/sensu-plugins-aws/cloudwatch-common.rb use the most recent datapoint (@mivok)
+
+
 ## [4.0.0] - 2016-12-27
 ### Breaking Changes
 - `check-sqs-messages.rb`, `check-vpc-vpn.rb`, and `metrics-elb.rb` were updated to aws-sdk v2 and no longer take `aws_access_key` and `aws_secret_access_key` options.
@@ -275,7 +289,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/4.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/4.1.0...HEAD
+[4.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/4.1.0...4.0.0
 [4.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.2.1...4.0.0
 [3.2.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.2.0...3.2.1
 [3.2.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.1.0...3.2.0

data/README.md

@@ -20,6 +20,10 @@
 
 **check-cloudwatch-alarm**
 
+**check-cloudwatch-metric**
+
+**check-cloudwatch-composite-metric**
+
 **check-cloudfront-tag**
 
 **check-configservice-rules**
@@ -153,6 +157,8 @@
 * /bin/check-configservice-rules.rb
 * /bin/check-cloudfront-tag.rb
 * /bin/check-cloudwatch-alarm.rb
+* /bin/check-cloudwatch-metric.rb
+* /bin/check-cloudwatch-composite-metric.rb
 * /bin/check-dynamodb-capacity.rb
 * /bin/check-dynamodb-throttle.rb
 * /bin/check-ebs-burst-limit.rb

data/bin/check-cloudwatch-composite-metric.rb

@@ -0,0 +1,132 @@
+#! /usr/bin/env ruby
+#
+# check-cloudwatch-composite-metric
+#
+# DESCRIPTION:
+#   This plugin retrieves a couple of values of two cloudwatch metrics,
+#   computes a percentage value based on the numerator metric and the denomicator metric
+#   and triggers alarms based on the thresholds specified.
+#   This plugin is an extension to the Andrew Matheny's check-cloudwatch-metric plugin
+#   and uses the CloudwatchCommon lib, extended as well.
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-cloudwatch-composite-metric.rb --namespace AWS/ELB -N HTTPCode_Backend_4XX -D RequestCount --dimensions LoadBalancerName=test-elb --period 60 --statistics Maximum --operator equal --critical 0
+#
+# NOTES:
+#
+# LICENSE:
+#   Cornel Foltea
+#   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 CloudWatchCompositeMetricCheck < Sensu::Plugin::Check::CLI
+  option :aws_region,
+         short: '-r AWS_REGION',
+         long: '--aws-region REGION',
+         description: 'AWS Region (defaults to us-east-1).',
+         default: 'us-east-1'
+
+  option :namespace,
+         description: 'CloudWatch namespace for metric',
+         short: '-n NAME',
+         long: '--namespace NAME',
+         default: 'AWS/EC2'
+
+  option :numerator_metric_name,
+         description: 'Numerator metric name',
+         short: '-N NAME',
+         long: '--numerator-metric NAME',
+         required: true
+
+  option :denominator_metric_name,
+         description: 'Denominator metric name',
+         short: '-D NAME',
+         long: '--denominator-metric NAME',
+         required: true
+
+  option :dimensions,
+         description: 'Comma delimited list of DimName=Value',
+         short: '-d DIMENSIONS',
+         long: '--dimensions DIMENSIONS',
+         proc: proc { |d| CloudWatchCompositeMetricCheck.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: '--operator OPERATION',
+         default: 'greater'
+
+  option :no_data_ok,
+         short: '-O',
+         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[:numerator_metric_name]}/#{config[:denominator_metric_name]}(#{dimension_string})"
+  end
+
+  def run
+    composite_check config
+  end
+end

data/bin/check-sns-subscriptions.rb

@@ -44,9 +44,9 @@ class CheckSNSSubscriptions < Sensu::Plugin::Check::CLI
 
     subscriptions = sns.list_subscriptions.subscriptions
 
-    pending_confirmations = subscriptions.select { |subscription| subscription.subscription_arn == 'PendingConfirmation' }
+    pending_confirmations = subscriptions.select { |subscription| subscription.subscription_arn == 'PendingConfirmation' }.map(&:topic_arn)
 
-    critical "#{pending_confirmations.size} pending confirmations" unless pending_confirmations.empty?
+    critical "#{pending_confirmations.size} pending confirmations (#{pending_confirmations})" unless pending_confirmations.empty?
     ok
   end
 end

data/bin/check-sqs-messages.rb

@@ -46,7 +46,7 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
   option :queue,
          short: '-q SQS_QUEUE',
          long: '--queue SQS_QUEUE',
-         description: 'The name of the SQS you want to check the number of messages for',
+         description: 'A comma seperated list of the SQS queue(s) you want to check the number of messages for',
          default: ''
 
   option :prefix,
@@ -99,20 +99,33 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
     Aws.config.update(aws_config)
     sqs = Aws::SQS::Resource.new
 
-    if config[:prefix] == ''
-      if config[:queue] == ''
+    if config[:prefix].empty?
+      if config[:queue].empty?
         critical 'Error, either QUEUE or PREFIX must be specified'
       end
 
-      url = sqs.get_queue_by_name(queue_name: config[:queue]).url
-      messages = sqs.client.get_queue_attributes(queue_url: url, attribute_names: ['All']).attributes[config[:metric]].to_i
+      warnings = []
+      crits = []
+      passing = []
+      queues = config[:queue].split(',')
+      queues.each do |q|
+        url = sqs.get_queue_by_name(queue_name: q).url
+        messages = sqs.client.get_queue_attributes(queue_url: url, attribute_names: ['All']).attributes[config[:metric]].to_i
 
-      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[:crit_under] >= 0 && messages < config[:crit_under]) || (config[:crit_over] >= 0 && messages > config[:crit_over])
+          crits << "#{messages} message(s) in #{q}"
+        elsif (config[:warn_under] >= 0 && messages < config[:warn_under]) || (config[:warn_over] >= 0 && messages > config[:warn_over])
+          warnings << "#{messages} message(s) in #{q}"
+        else
+          passing << "#{messages} message(s) in #{q}"
+        end
+      end
+      if crits.any?
+        critical crits.join(', ').to_s
+      elsif warnings.any?
+        warning warnings.join(', ').to_s
       else
-        ok "#{messages} messages in #{config[:queue]} queue"
+        ok "all queue(s): #{queues} are OK"
       end
     else
       warn = false

data/bin/metrics-elasticache.rb

@@ -100,7 +100,7 @@ class ElasticMetrics < Sensu::Plugin::Metric::CLI::Graphite
       r = cloud_watch_metric(key, static, cache_cluster_id)
       result['elasticache.' + cache_cluster_id + '.' + key] = r[:datapoints][0] unless r[:datapoints][0].nil?
     end
-    return unless result.nil?
+    return if result.nil?
     result.each do |key, value|
       output key.downcase.to_s, value.average, value[:timestamp].to_i
     end

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

@@ -7,7 +7,7 @@ module CloudwatchCommon
   end
 
   def read_value(resp, stats)
-    resp.datapoints.first.send(stats.downcase)
+    resp.datapoints.sort_by(&:timestamp).last.send(stats.downcase)
   end
 
   def resp_has_no_data(resp, stats)
@@ -40,6 +40,49 @@ module CloudwatchCommon
     }
   end
 
+  def composite_metrics_request(config, metric, fixed_time_now = Time.now)
+    {
+      namespace: config[:namespace],
+      metric_name: config[metric],
+      dimensions: config[:dimensions],
+      start_time: fixed_time_now - config[:period] * 10,
+      end_time: fixed_time_now,
+      period: config[:period],
+      statistics: [config[:statistics]],
+      unit: config[:unit]
+    }
+  end
+
+  def composite_check(config)
+    fixed_time_now = Time.now
+    numerator_metric_resp = client.get_metric_statistics(composite_metrics_request(config, :numerator_metric_name, fixed_time_now))
+    denominator_metric_resp = client.get_metric_statistics(composite_metrics_request(config, :denominator_metric_name, fixed_time_now))
+
+    no_data = resp_has_no_data(numerator_metric_resp, config[:statistics]) || \
+              resp_has_no_data(denominator_metric_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
+
+    denominator_value = read_value(denominator_metric_resp, config[:statistics]).to_f
+    if denominator_value.zero?
+      ok "#{metric_desc} denominator value is zero but that's ok"
+    end
+    numerator_value = read_value(numerator_metric_resp, config[:statistics]).to_f
+    value = (numerator_value / denominator_value * 100).to_i
+    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
+
   def check(config)
     resp = client.get_metric_statistics(metrics_request(config))
 

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

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
     MAJOR = 4
-    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: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -264,6 +250,7 @@ executables:
 - check-certificate-expiry.rb
 - check-cloudfront-tag.rb
 - check-cloudwatch-alarm.rb
+- check-cloudwatch-composite-metric.rb
 - check-cloudwatch-metric.rb
 - check-configservice-rules.rb
 - check-dynamodb-capacity.rb
@@ -342,6 +329,7 @@ files:
 - bin/check-certificate-expiry.rb
 - bin/check-cloudfront-tag.rb
 - bin/check-cloudwatch-alarm.rb
+- bin/check-cloudwatch-composite-metric.rb
 - bin/check-cloudwatch-metric.rb
 - bin/check-configservice-rules.rb
 - bin/check-dynamodb-capacity.rb