sensu-plugins-aws 16.2.0 → 17.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d17caf7ac0047d02b2d9f339fcc7a445f88492c23ac96a5da4ffc957740c29
-  data.tar.gz: a67fa60ca62797968ddab4bb33d899dba1b4c8a1aeac2a676eef3babc24f5bd1
+  metadata.gz: b05e0394036396881a2c21bdf8c448eb856c59ce2d6b823552bcca6bbdcc6d7f
+  data.tar.gz: 1ee23068ea1c8d72f2fcf549baa0213cb2d4beda05664861890302a26caf50e0
 SHA512:
-  metadata.gz: 593b2de9a5809ca5cabb4f0e56effca1bee0b9b5a9392c9dca61ca95fd6df3b1fc2d83510739924649a60165f63ee2928fc165203fe414b3a05e705172953c3a
-  data.tar.gz: ec57ca98fa34966aa253194585b38c2294da22a6a014a1abeb0461b523043d8dfe65e2b0077147d47dfa26301bce3c16beee416c692139efdc5898cbe80fd855
+  metadata.gz: 63e63fa98ee696e071f56809357695c80a206618964b0dc85f160d87e42bd8db2c693b97622d82f66153205d8ce4a42b4113589e1496e15a0ead826c0a4ce74e
+  data.tar.gz: f3313e41ad7cf05d9c2717a60cca0061cacbf9bcd3a2734678fa358595f4928c2841615e3212a3f5866798a7f7d2e5c4d0b42d416e12c04af2679b3663babe5b

data/CHANGELOG.md

@@ -4,10 +4,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md)
 
 ## [Unreleased]
+## [17.0.0] - 2019-03-26
+### Breaking Changes
+- `metrics-cloudfront.rb` `--metric` option was renamed to `--metrics`. (@boutetnico)
+
+### Added
+- `check-sqs-messages.rb`: adding option `--exclude-queues` for use in blacklisting specific queues in conjunction with `--prefix` flag. (@ruke47)
+
+### Changed
+- `metrics-cloudfront.rb` now accepts multiple metrics. (@boutetnico)
 
 ## [16.2.0] - 2019-02-19
 ### Fixed
 - removed codeclimate (@tmonk42)
+- properly iterate over IPs in check-vpc-nameservers.rb (@masneyb)
 
 ### Added
 - `check-ec2-cpu_balance.rb`: adding option `--instance-families` to manage which instance families to check. (@cyrilgdn)
@@ -543,7 +553,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/16.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/17.0.0...HEAD
+[17.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/16.2.0...17.0.0
 [16.2.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/16.1.0...16.2.0
 [16.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/16.0.0...16.1.0
 [16.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/15.0.0...16.0.0

data/bin/check-sqs-messages.rb

@@ -43,11 +43,19 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
          description: 'AWS Region (defaults to us-east-1).',
          default: 'us-east-1'
 
-  option :queue,
+  option :queues,
          short: '-q SQS_QUEUE',
          long: '--queue SQS_QUEUE',
          description: 'A comma seperated list of the SQS queue(s) you want to check the number of messages for',
-         default: ''
+         default: [],
+         proc: proc { |q| q.split(',') }
+
+  option :exclude_queues,
+         short: '-Q SQS_QUEUES',
+         long: '--exclude-queues SQS_QUEUE',
+         description: 'A comma separated list of the SQS queue(s) to exclude, if using --prefix',
+         default: [],
+         proc: proc { |q| q.split(',') }
 
   option :prefix,
          short: '-p PREFIX',
@@ -100,14 +108,14 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
     sqs = Aws::SQS::Resource.new
 
     if config[:prefix].empty?
-      if config[:queue].empty?
+      if config[:queues].empty?
         critical 'Error, either QUEUE or PREFIX must be specified'
       end
 
       warnings = []
       crits = []
       passing = []
-      queues = config[:queue].split(',')
+      queues = config[:queues]
       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
@@ -131,11 +139,14 @@ class SQSMsgs < Sensu::Plugin::Check::CLI
       warn = false
       crit = false
       queues = []
+      exclusions = config[:exclude_queues]
 
       sqs.queues(queue_name_prefix: config[:prefix]).each do |q|
         messages = sqs.client.get_queue_attributes(queue_url: q.url, attribute_names: ['All']).attributes[config[:metric]].to_i
         queue_name = q.attributes['QueueArn'].split(':').last
 
+        next if exclusions.include? queue_name
+
         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"

data/bin/check-vpc-nameservers.rb

@@ -65,7 +65,7 @@ class CheckVpcNameservers < Sensu::Plugin::Check::CLI
     options.dhcp_options.each do |option|
       option.dhcp_configurations.each do |map|
         next if map.key != 'domain-name-servers'
-        map.each_value do |value|
+        map.values.each do |value| # rubocop:disable Performance/HashEachMethods
           ip = value.value
           config[:queries].each do |query|
             begin

data/bin/metrics-cloudfront.rb

@@ -36,7 +36,7 @@ require 'time'
 class CloudFrontMetrics < Sensu::Plugin::Metric::CLI::Graphite
   include Common
   option :distribution_id,
-         description: 'Distribution id of Cloudfront',
+         description: 'Distribution id of Cloudfront (defaults to all distributions)',
          short: '-d DISTRIBUTION_ID',
          long: '--distribution_id DISTRIBUTION_ID'
 
@@ -52,11 +52,10 @@ class CloudFrontMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'AWS Region (defaults to us-east-1).',
          default: 'us-east-1'
 
-  option :metric,
-         description: 'Metric to fetch',
-         short: '-m METRIC',
-         long: '--metric',
-         in: %w[Requests BytesDownloaded BytesUploaded TotalErrorRate 4xxErrorRate 5xxErrorRate]
+  option :metrics,
+         description: 'Commas separated list of metric(s) to fetch',
+         short: '-m METRIC1,METRIC2',
+         long: '--metrics METRIC1,METRIC2'
 
   option :end_time,
          short:       '-t T',
@@ -76,7 +75,7 @@ class CloudFrontMetrics < Sensu::Plugin::Metric::CLI::Graphite
     @cloud_watch ||= Aws::CloudWatch::Client.new
   end
 
-  def cloud_watch_metric(metric_name, value, distribution_id)
+  def cloud_watch_metric(metric_name, statistics, distribution_id)
     cloud_watch.get_metric_statistics(
       namespace: 'AWS/CloudFront',
       metric_name: metric_name,
@@ -90,36 +89,36 @@ class CloudFrontMetrics < Sensu::Plugin::Metric::CLI::Graphite
           value: distribution_id
         }
       ],
-      statistics: [value],
+      statistics: [statistics],
       start_time: config[:end_time] - config[:period],
       end_time: config[:end_time],
       period: config[:period]
     )
   end
 
-  def distribution_list
+  def distribution_list(metrics)
     list_metrics = cloud_watch.list_metrics(
       namespace: 'AWS/CloudFront'
     ).metrics
 
-    list_metrics = list_metrics.select { |e| e.metric_name == config[:metric] } unless config[:metric].nil?
+    list_metrics = list_metrics.select { |e| metrics.include? e.metric_name }
 
     list_metrics.reduce(Set.new) do |result, item|
       result << item.dimensions.find { |element| element.name == 'DistributionId' }.value
     end
   end
 
-  def print_statistics(distribution_id, statistics)
-    statistics.each do |key, static|
-      r = cloud_watch_metric(key, static, distribution_id)
+  def print_statistics(distribution_id, statistic)
+    statistic.each do |metric, static|
+      r = cloud_watch_metric(metric, static, distribution_id)
       keys = [config[:scheme]]
-      keys.concat [distribution_id, key, static]
+      keys.concat [distribution_id, metric, static]
       output(keys.join('.'), r[:datapoints].first[static.downcase]) unless r[:datapoints].first.nil?
     end
   end
 
-  def run
-    statistic = {
+  def print_metrics(distribution_id, metrics)
+    metrics_statistic = {
       'Requests' => 'Sum',
       'BytesDownloaded' => 'Sum',
       'BytesUploaded' => 'Sum',
@@ -128,19 +127,33 @@ class CloudFrontMetrics < Sensu::Plugin::Metric::CLI::Graphite
       '5xxErrorRate' => 'Average'
     }
 
-    unless config[:metric].nil?
-      statistic.select! { |key, _| key == config[:metric] }
+    metrics.each do |metric|
+      statistic = metrics_statistic.select { |key, _| key == metric }
+      if statistic.empty?
+        unknown "Invalid metric #{metric}. Possible values: #{metrics_statistic.keys.join(',')}"
+      end
+      print_statistics(distribution_id, statistic)
     end
+  end
 
-    begin
-      if config[:distribution_id].nil?
-        distribution_list.each do |distribution|
-          print_statistics(distribution, statistic)
-        end
-      else
-        print_statistics(config[:distribution_id], statistic)
+  def parse_metrics(metrics)
+    if metrics.nil?
+      unknown 'No metrics provided. See usage for details'
+    end
+    metrics.split(',')
+  end
+
+  def run
+    metrics = parse_metrics(config[:metrics])
+
+    if config[:distribution_id].nil?
+      distribution_list(metrics).each do |distribution|
+        print_metrics(distribution, metrics)
       end
-      ok
+    else
+      print_metrics(config[:distribution_id], metrics)
     end
+
+    ok
   end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
-    MAJOR = 16
-    MINOR = 2
+    MAJOR = 17
+    MINOR = 0
     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: 16.2.0
+  version: 17.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -424,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with an AWS environment