sensu-plugins-aws 10.1.1 → 10.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab932b622a455c57a0452d064e70eec97da6406360f1fdbb07fdc22947a16da
-  data.tar.gz: 4b8ab5f873b2c36a57d1cf70bb56da5aeb35ead249e14cc319b7142b52bb2985
+  metadata.gz: 9563afe668b4a84ecb1d41560588231c94ea851d528cf725e9b4aeec4b2dd8d6
+  data.tar.gz: f457e971482d604d8b6817d827ce6c1db1ccea3c1106a89688cd60b4642311c2
 SHA512:
-  metadata.gz: 2523108ce56e1a7c4d1745f6b7df570fe35406ab7330795fbc78fbc6204e3f282b7d89b658103e791c87572db422268e9680c8464411f989d14194f4cf37cb6f
-  data.tar.gz: bf6d5e42ab154e9b3f3806adf88343bc47a2f2da9fc6c4cd7e80342c61b915e04dec1a3c6fcb045eb714c6a930d364a4887a3f1d61a6e775de304d6d08706efb
+  metadata.gz: 86f975041f3167beba850ef75e2b26e04cfa9f69ec737fe26d3528184d97c1e88df9b364552c1e3a54c74e6f5ed3e19e50d3dd35a4d74f895feb5d01d1fc193f
+  data.tar.gz: c331bbacf81e08ff41b2a6ea97c68d755d6dfd6b583fad824bf91017f8ba5585e85620545cb8fffcfd4e6ba7114bfe7e642ca5b21c83fcebeabd11893886bb57

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [10.1.2] - 2018-01-13
+### Security
+- updated rubocop dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@majormoses)
+
+### Changed
+- appease the new cops where it required light refactoring, called out TODO's for later refactoring (@majormoses)
+
 ## [10.1.1.] - 2018-01-13
 ### Fixed
 - check-instance-health.rb: fixed incorrect test operator from `&&` to `||` in `gather_events`, should reject if either case is true. (@randeffects)
@@ -13,6 +20,7 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 - check-cloudwatch-composite-metric.rb: add flags `zero_denominator_data_ok`, `no_denominator_data_ok`, and `numerator_default` to add ability to allow numerator in composite to be 0. While leaving the functionality of `no_data_ok` the same, this change allows us to check to alert if the numerator has no data since 0/X is a valid alert case. (@zbintliff)
 - lib/cloudwatch-common.rb: added tests for majority of functions (@zbintliff)
 
+
 ## [10.0.3] - 2017-12-03
 ### Fixed
 - metrics-asg.rb: fix dimension name, handle the --scheme flag, make the --statistic flag work, support autoscaling groups containing spaces in their name (@multani)
@@ -415,6 +423,7 @@ WARNING:  This release contains major breaking changes that will impact all user
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.1.1...HEAD
+[10.1.2]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.1.1...10.1.2
 [10.1.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.1.0...10.1.1
 [10.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.1.0...10.0.3
 [10.0.3]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.0.2...10.0.3

data/bin/check-asg-instances-created.rb

@@ -116,7 +116,7 @@ class CheckAsgInstanceCreated < Sensu::Plugin::Check::CLI
         end
       end
     end
-    if instance_terminating == 0 && instance_launching == 0
+    if instance_terminating.zero? && instance_launching.zero?
       ok 'No instances Launched & Terminated last hour'
     elsif instance_terminating >= critical && instance_launching >= critical
       critical "#{result_launched} \n #{result_terminated}"

data/bin/check-asg-instances-inservice.rb

@@ -70,7 +70,7 @@ class CheckAsgInstancesInService < Sensu::Plugin::Check::CLI
             instance_in_service += 1
           end
         end
-        if instance_in_service == 0
+        if instance_in_service.zero?
           critical = 1
           result += "#{grp_name}: no Instances inService  #{instance_in_service} \n"
         elsif instance_in_service < group.min_size
@@ -88,7 +88,7 @@ class CheckAsgInstancesInService < Sensu::Plugin::Check::CLI
           instance_in_service += 1
         end
       end
-      if instance_in_service == 0
+      if instance_in_service.zero?
         critical = 1
         result += "#{config[:group]}: no Instances inService  #{instance_in_service} \n"
       elsif instance_in_service < min_size

data/bin/check-beanstalk-elb-metric.rb

@@ -106,7 +106,7 @@ class BeanstalkELBCheck < Sensu::Plugin::Check::CLI
                                                .describe_environment_resources(environment_name: config[:environment])
                                                .environment_resources
                                                .load_balancers[config[:elb_idx]]
-                  .name
+                                               .name
   end
 
   def run

data/bin/check-beanstalk-health.rb

@@ -54,7 +54,7 @@ class BeanstalkHealth < Sensu::Plugin::Check::CLI
     @env_health ||= beanstalk_client
                     .describe_environment_health(
                       environment_name: config[:environment],
-                      attribute_names: %w(Color Status HealthStatus Causes)
+                      attribute_names: %w[Color Status HealthStatus Causes]
                     )
   end
 
@@ -72,13 +72,13 @@ class BeanstalkHealth < Sensu::Plugin::Check::CLI
     @instances_health ||= begin
       curr_instances = beanstalk_client.describe_instances_health(
         environment_name: config[:environment],
-        attribute_names: %w(Color HealthStatus Causes)
+        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)
+          attribute_names: %w[Color HealthStatus Causes]
         )
         instances.concat(curr_instances.instance_health_list)
       end
@@ -87,7 +87,7 @@ class BeanstalkHealth < Sensu::Plugin::Check::CLI
   end
 
   def unhealthy_instances
-    @unhealthy_instances ||= instances_health.select { |i| i.color != 'Green' }
+    @unhealthy_instances ||= instances_health.reject { |i| i.color == 'Green' }
   end
 
   def status_rollup

data/bin/check-cloudfront-tag.rb

@@ -54,7 +54,7 @@ class CheckCloudFrontTag < Sensu::Plugin::Check::CLI
         if keys.sort & tags.sort != tags.sort
           missing_tags.push distribution.id
         end
-      rescue => _
+      rescue StandardError
         missing_tags.push distribution.id
       end
     end
@@ -64,7 +64,7 @@ class CheckCloudFrontTag < Sensu::Plugin::Check::CLI
     else
       critical("Missing tags in #{missing_tags}")
     end
-  rescue => e
+  rescue StandardError => e
     critical "Error: #{e.message} - #{e.backtrace}"
   end
 end

data/bin/check-cloudwatch-alarm.rb

@@ -95,8 +95,7 @@ class CloudWatchCheck < Sensu::Plugin::Check::CLI
     end
 
     ok message
-
-  rescue => e
+  rescue StandardError => e
     puts "Error: exception: #{e}"
     critical
   end

data/bin/check-cloudwatch-alarms.rb

@@ -70,8 +70,7 @@ class CloudWatchCheck < Sensu::Plugin::Check::CLI
     critical "#{alarms.size} in '#{config[:state]}' state: #{alarms.map(&:alarm_name).join(',')}" unless alarms.empty?
 
     ok 'everything looks good'
-
-  rescue => e
+  rescue StandardError => e
     puts "Error: exception: #{e}"
     critical
   end

data/bin/check-configservice-rules.rb

@@ -70,7 +70,7 @@ class CheckConfigServiceRules < Sensu::Plugin::Check::CLI
     else
       ok
     end
-  rescue => e
+  rescue StandardError => e
     unknown "An error occurred processing AWS ConfigService API: #{e.message}"
   end
 end

data/bin/check-dynamodb-capacity.rb

@@ -84,11 +84,11 @@ class CheckDynamoDB < Sensu::Plugin::Check::CLI
   option :capacity_for,
          short:       '-c N',
          long:        '--capacity-for NAME',
-         default:     [:read, :write],
+         default:     %i[read write],
          proc:        proc { |a| a.split(/[,;]\s*/).map { |n| n.downcase.intern } },
          description: 'Read/Write (or both) capacity to check.'
 
-  %w(warning critical).each do |severity|
+  %w[warning critical].each do |severity|
     option :"#{severity}_over",
            long:        "--#{severity}-over N",
            # #YELLOW
@@ -156,12 +156,12 @@ class CheckDynamoDB < Sensu::Plugin::Check::CLI
       metric        = cloud_watch_metric metric_name, table.table_name
       metric_value  = begin
                         latest_value(metric)
-                      rescue
+                      rescue StandardError
                         0
                       end
       percentage    = metric_value / table.provisioned_throughput.send("#{r_or_w}_capacity_units").to_f * 100
 
-      @severities.keys.each do |severity|
+      @severities.each_key do |severity|
         threshold = config[:"#{severity}_over"]
         next unless threshold
         next if percentage < threshold

data/bin/check-dynamodb-throttle.rb

@@ -80,11 +80,11 @@ class CheckDynamoDB < Sensu::Plugin::Check::CLI
   option :throttle_for,
          short:       '-c N',
          long:        '--throttle-for NAME',
-         default:     [:read, :write],
+         default:     %i[read write],
          proc:        proc { |a| a.split(/[,;]\s*/).map { |n| n.downcase.intern } },
          description: 'Read/Write (or both) throttle to check.'
 
-  %w(warning critical).each do |severity|
+  %w[warning critical].each do |severity|
     option :"#{severity}_over",
            long:        "--#{severity}-over N",
            proc:        proc(&:to_f),
@@ -151,11 +151,11 @@ class CheckDynamoDB < Sensu::Plugin::Check::CLI
       metric        = cloud_watch_metric metric_name, table.table_name
       metric_value  = begin
                         latest_value(metric)
-                      rescue
+                      rescue StandardError
                         0
                       end
 
-      @severities.keys.each do |severity|
+      @severities.each_key do |severity|
         threshold = config[:"#{severity}_over"]
         next unless threshold
         next if metric_value < threshold

data/bin/check-ec2-cpu_balance.rb

@@ -110,13 +110,13 @@ class EC2CpuBalance < Sensu::Plugin::Check::CLI
             level = 2
             messages << "#{id}#{tag} is below critical threshold [#{result} < #{config[:critical]}]\n"
           elsif config[:warning] && result < config[:warning]
-            level = 1 if level == 0
+            level = 1 if level.zero?
             messages << "#{id}#{tag} is below warning threshold [#{result} < #{config[:warning]}]\n"
           end
         end
       end
     end
-    ok messages if level == 0
+    ok messages if level.zero?
     warning messages if level == 1
     critical messages if level == 2
   end

data/bin/check-ec2-filter.rb

@@ -183,7 +183,7 @@ class EC2Filter < Sensu::Plugin::Check::CLI
     end
 
     ok message
-  rescue => e
+  rescue StandardError => e
     puts "Error: exception: #{e}"
     critical
   end

data/bin/check-ec2-network.rb

@@ -73,7 +73,7 @@ class CheckEc2Network < Sensu::Plugin::Check::CLI
          default:     'NetworkIn',
          description: 'Select NetworkIn or NetworkOut'
 
-  %w(warning critical).each do |severity|
+  %w[warning critical].each do |severity|
     option :"#{severity}_over",
            long:        "--#{severity}-over COUNT",
            description: "Trigger a #{severity} if network traffice is over specified Bytes"

data/bin/check-ecs-service-health.rb

@@ -95,7 +95,7 @@ class CheckEcsServiceHealth < Sensu::Plugin::Check::CLI
   end
 
   def bucket_service(running_count, desired_count)
-    if running_count == 0 && desired_count > 0
+    if running_count.zero? && desired_count > 0
       :critical
     elsif running_count < desired_count
       :warn
@@ -149,7 +149,7 @@ class CheckEcsServiceHealth < Sensu::Plugin::Check::CLI
     else
       ok
     end
-  rescue => e
+  rescue StandardError => e
     unknown "An error occurred processing AWS ECS API: #{e.message}"
   end
 end

data/bin/check-elb-certs.rb

@@ -94,7 +94,7 @@ class CheckELBCerts < Sensu::Plugin::Check::CLI
 
             begin
               http.start { cert = http.peer_cert }
-            rescue => e
+            rescue StandardError => e
               critical "An issue occurred attempting to get cert: #{e.message}"
             end
 
@@ -111,7 +111,7 @@ class CheckELBCerts < Sensu::Plugin::Check::CLI
           end
         end
       end
-    rescue => e
+    rescue StandardError => e
       unknown "An error occurred processing AWS ELB API: #{e.message}"
     end
 

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

@@ -76,7 +76,7 @@ class ELBHealth < Sensu::Plugin::Check::CLI
       instance_az = Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/placement/availability-zone/'))
     end
     instance_az[0...-1]
-  rescue
+  rescue StandardError
     raise "Cannot obtain this instance's Availability Zone. Maybe not running on AWS?"
   end
 
@@ -87,7 +87,7 @@ class ELBHealth < Sensu::Plugin::Check::CLI
   end
 
   def run
-    aws_region = (config[:aws_region].nil? || config[:aws_region].empty?) ? query_instance_region : config[:aws_region]
+    aws_region = config[:aws_region].nil? || config[:aws_region].empty? ? query_instance_region : config[:aws_region]
     begin
       elb = Fog::AWS::ELB.new aws_config
       if config[:instances]
@@ -107,7 +107,7 @@ class ELBHealth < Sensu::Plugin::Check::CLI
       else
         critical "Detected [#{unhealthy_instances.size}] unhealthy instances"
       end
-    rescue => e
+    rescue StandardError => e
       warning "An issue occured while communicating with the AWS EC2 API: #{e.message}"
     end
   end

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

@@ -136,7 +136,7 @@ class ELBHealth < Sensu::Plugin::Check::CLI
     @message = ''
     critical = false
 
-    unless config[:aws_region].casecmp('all') == 0
+    unless config[:aws_region].casecmp('all').zero?
       if aws_regions.include? config[:aws_region]
         aws_regions.clear.push(config[:aws_region])
       else

data/bin/check-elb-health.rb

@@ -73,13 +73,13 @@ class ELBHealth < Sensu::Plugin::Check::CLI
       instance_az = Net::HTTP.get(URI('http://169.254.169.254/latest/meta-data/placement/availability-zone/'))
     end
     instance_az[0...-1]
-  rescue
+  rescue StandardError
     raise "Cannot obtain this instance's Availability Zone. Maybe not running on AWS?"
   end
 
   def run
     begin
-      aws_region = (config[:aws_region].nil? || config[:aws_region].empty?) ? query_instance_region : config[:aws_region]
+      aws_region = config[:aws_region].nil? || config[:aws_region].empty? ? query_instance_region : config[:aws_region]
       elb = RightAws::ElbInterface.new(config[:aws_access_key], config[:aws_secret_access_key],
                                        logger: Logger.new('/dev/null'),
                                        cache: false,
@@ -90,7 +90,7 @@ class ELBHealth < Sensu::Plugin::Check::CLI
       else
         health = elb.describe_instance_health(config[:elb_name])
       end
-    rescue => e
+    rescue StandardError => e
       critical "An issue occured while communicating with the AWS EC2 API: #{e.message}"
     end
     # #YELLOW

data/bin/check-elb-latency.rb

@@ -80,7 +80,7 @@ class CheckELBLatency < Sensu::Plugin::Check::CLI
          proc:        proc { |a| a.downcase.intern },
          description: 'CloudWatch statistics method'
 
-  %w(warning critical).each do |severity|
+  %w[warning critical].each do |severity|
     option :"#{severity}_over",
            long:        "--#{severity}-over SECONDS",
            proc:        proc(&:to_f),
@@ -134,11 +134,11 @@ class CheckELBLatency < Sensu::Plugin::Check::CLI
     metric        = latency_metric elb.name
     metric_value  = begin
                       latest_value metric
-                    rescue
+                    rescue StandardError
                       0
                     end
 
-    @severities.keys.each do |severity|
+    @severities.each_key do |severity|
       threshold = config[:"#{severity}_over"]
       next unless threshold
       next if metric_value < threshold

data/bin/check-elb-nodes.rb

@@ -116,7 +116,7 @@ class CheckELBNodes < Sensu::Plugin::Check::CLI
       critical 'ELB has no nodes'
     elsif state['Unknown'].count == num_instances
       unknown 'All nodes in unknown state'
-    elsif state['InService'].count == 0
+    elsif state['InService'].count.zero?
       critical message
     elsif config[:crit_under] > 0 && config[:crit_under] >= state['InService'].count
       critical message

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

@@ -72,7 +72,7 @@ class CheckELBSumRequests < Sensu::Plugin::Check::CLI
          proc:        proc(&:to_i),
          description: 'CloudWatch metric statistics period'
 
-  %w(warning critical).each do |severity|
+  %w[warning critical].each do |severity|
     option :"#{severity}_over",
            long:        "--#{severity}-over COUNT",
            proc:        proc(&:to_f),
@@ -126,11 +126,11 @@ class CheckELBSumRequests < Sensu::Plugin::Check::CLI
     metric        = latency_metric elb.name
     metric_value  = begin
                       latest_value metric
-                    rescue
+                    rescue StandardError
                       0
                     end
 
-    @severities.keys.each do |severity|
+    @severities.each_key do |severity|
       threshold = config[:"#{severity}_over"]
       puts metric_value
       next unless threshold

data/bin/check-emr-cluster.rb

@@ -137,7 +137,7 @@ class CheckEMRCluster < Sensu::Plugin::Check::CLI
           ok "EMR cluster #{config[:cluster_name]} - #{humanize(age)}"
         end
       end
-    rescue => e
+    rescue StandardError => e
       critical "EMR cluster #{config[:cluster_name]} - #{e.message}"
     end
   end

data/bin/check-eni-status.rb

@@ -92,9 +92,9 @@ class ENIStatus < Sensu::Plugin::Check::CLI
 
       if status.nil?
         warnings << "No Information found for #{e}"
-      elsif config[:crit_status].casecmp(status[:status]) == 0
+      elsif config[:crit_status].casecmp(status[:status]).zero?
         crits << "#{e} is #{status[:status]}"
-      elsif config[:warn_status].casecmp(status[:status]) == 0
+      elsif config[:warn_status].casecmp(status[:status]).zero?
         warnings << "#{e} is #{status[:status]}"
       end
     end

data/bin/check-instance-events.rb

@@ -83,7 +83,7 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
 
     aws_regions = ec2_regions
 
-    unless config[:aws_region].casecmp('all') == 0
+    unless config[:aws_region].casecmp('all').zero?
       if aws_regions.include? config[:aws_region]
         aws_regions.clear.push(config[:aws_region])
       else
@@ -96,7 +96,8 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
       aws_config[:secret_access_key] = config[:aws_secret_access_key]
     end
 
-    aws_regions.each do |r| # Iterate each possible region
+    # TODO: come back and refactor this
+    aws_regions.each do |r| # Iterate each possible region # rubocop:disable Metrics/BlockLength)
       ec2 = Aws::EC2::Client.new(aws_config.merge!(region: r))
       begin
         describe_instance_options = {}
@@ -127,7 +128,7 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
                 instance_desc = ec2.describe_instances(instance_ids: [i[:instance_id]])
                 name_tag = instance_desc.reservations[0].instances[0].tags.find { |tag| tag[:key] == 'Name' }
                 name = name_tag.nil? ? '' : name_tag.value
-              rescue => e
+              rescue StandardError => e
                 puts "Issue getting instance details for #{i[:instance_id]} (#{r}).  Exception = #{e}"
               end
             end
@@ -139,7 +140,7 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
                                end
           end
         end
-      rescue => e
+      rescue StandardError => e
         unknown "An error occurred processing AWS EC2 API (#{r}): #{e.message}"
       end
     end