sensu-plugins-aws 14.0.0 → 15.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4c125fe85336325c696743b86e583d8dd5f15bc
-  data.tar.gz: f47506bebde25ee38b67630caa56c79b6fe17beb
+  metadata.gz: 88538012dc8a180460b5940bcdd1da6888a589c5
+  data.tar.gz: 6c54d7bf29e80f548b3ea9c82500c8ba92d8e98a
 SHA512:
-  metadata.gz: 41a57b823a533d2c30ae145e7a23ca7f5b4ab96103d648cf2f030efbd7bc12215c0e1ceaabbbd07f5d05d9e3c1a024d07c6cf074332c28d69bc177c076295cea
-  data.tar.gz: 75858702513638477429cc66226c8442ccf71d655f570105f3e7785d9d02f34be51368bac69dccfc122c5d9bffe879339707ca3e4aa60305ae70775d6c5cd31f
+  metadata.gz: a6d595483bf559aa7a2e647f7cb01100fa5cdfb99bf2eba5c6e74b6b4f59fe047e452e0c5c603c1b2b062b2e5d724adead5c012b49fce7419f2297e748ab2987
+  data.tar.gz: 794ca978c9026de692fcdb46bc1fd4ee357f1d404fbfb7898dafb89afd7ce0e86d667cda1b73434ede27f8921c69d770b66619b6bd2d9bd2e5d90356b2eb5ddc

data/CHANGELOG.md

@@ -5,6 +5,12 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [15.0.0] - 2018-11-01
+### Breaking Changes
+- `check-elb-latency.rb` no longer takes `aws_access_key` and `aws_secret_access_key` options. (@boutetnico)
+ ### Changed
+- `check-elb-latency.rb` was updated to aws-sdk v2. (@boutetnico)
+
 ## [14.0.0] - 2018-11-01
 ### Breaking Changes
 - `check-elb-sum-requests.rb` no longer takes `aws_access_key` and `aws_secret_access_key` options. (@boutetnico)
@@ -520,7 +526,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/14.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/15.0.0...HEAD
+[15.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/14.0.0...15.0.0
 [14.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/13.0.0...14.0.0
 [13.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/12.4.0...13.0.0
 [12.4.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/12.3.0...12.4.0

data/bin/check-elb-latency.rb

@@ -4,7 +4,7 @@
 #
 #
 # DESCRIPTION:
-#   This plugin checks the health of an Amazon Elastic Load Balancer.
+#   This plugin checks the latency of an Amazon Elastic Load Balancer.
 #
 # OUTPUT:
 #   plain-text
@@ -13,7 +13,7 @@
 #   Linux
 #
 # DEPENDENCIES:
-#   gem: aws-sdk-v1
+#   gem: aws-sdk
 #   gem: sensu-plugin
 #
 # USAGE:
@@ -32,20 +32,11 @@
 #
 
 require 'sensu-plugin/check/cli'
-require 'aws-sdk-v1'
+require 'sensu-plugins-aws'
+require 'aws-sdk'
 
 class CheckELBLatency < Sensu::Plugin::Check::CLI
-  option :aws_access_key,
-         short:       '-a AWS_ACCESS_KEY',
-         long:        '--aws-access-key AWS_ACCESS_KEY',
-         description: "AWS Access Key. Either set ENV['AWS_ACCESS_KEY'] or provide it as an option",
-         default:     ENV['AWS_ACCESS_KEY']
-
-  option :aws_secret_access_key,
-         short:       '-k AWS_SECRET_KEY',
-         long:        '--aws-secret-access-key AWS_SECRET_KEY',
-         description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_KEY'] or provide it as an option",
-         default:     ENV['AWS_SECRET_KEY']
+  include Common
 
   option :aws_region,
          short:       '-r AWS_REGION',
@@ -87,42 +78,41 @@ class CheckELBLatency < Sensu::Plugin::Check::CLI
            description: "Trigger a #{severity} if latancy is over specified seconds"
   end
 
-  def aws_config
-    { access_key_id: config[:aws_access_key],
-      secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region] }
-  end
-
   def elb
-    @elb ||= AWS::ELB.new aws_config
+    @elb ||= Aws::ElasticLoadBalancing::Client.new(aws_config)
   end
 
   def cloud_watch
-    @cloud_watch ||= AWS::CloudWatch.new aws_config
+    @cloud_watch ||= Aws::CloudWatch::Client.new
   end
 
   def elbs
     return @elbs if @elbs
-    @elbs = elb.load_balancers.to_a
-    @elbs.select! { |elb| config[:elb_names].include? elb.name } if config[:elb_names]
+    @elbs = elb.describe_load_balancers.load_balancer_descriptions.to_a
+    @elbs.select! { |elb| config[:elb_names].include? elb.load_balancer_name } if config[:elb_names]
     @elbs
   end
 
   def latency_metric(elb_name)
-    cloud_watch.metrics.with_namespace('AWS/ELB').with_metric_name('Latency').with_dimensions(name: 'LoadBalancerName', value: elb_name).first
-  end
-
-  def statistics_options
-    {
+    cloud_watch.get_metric_statistics(
+      namespace: 'AWS/ELB',
+      metric_name: 'Latency',
+      dimensions: [
+        {
+          name: 'LoadBalancerName',
+          value: elb_name
+        }
+      ],
       start_time: config[:end_time] - config[:period],
-      end_time:   config[:end_time],
+      end_time: config[:end_time],
       statistics: [config[:statistics].to_s.capitalize],
-      period:     config[:period]
-    }
+      period: config[:period],
+      unit: 'Seconds'
+    )
   end
 
   def latest_value(metric)
-    metric.statistics(statistics_options.merge(unit: 'Seconds')).datapoints.sort_by { |datapoint| datapoint[:timestamp] }.last[config[:statistics]]
+    metric.datapoints.sort_by { |datapoint| datapoint[:timestamp] }.last[config[:statistics]]
   end
 
   def flag_alert(severity, message)
@@ -131,7 +121,7 @@ class CheckELBLatency < Sensu::Plugin::Check::CLI
   end
 
   def check_latency(elb)
-    metric        = latency_metric elb.name
+    metric        = latency_metric elb.load_balancer_name
     metric_value  = begin
                       latest_value metric
                     rescue StandardError
@@ -143,14 +133,14 @@ class CheckELBLatency < Sensu::Plugin::Check::CLI
       next unless threshold
       next if metric_value < threshold
       flag_alert severity,
-                 "; #{elbs.size == 1 ? nil : "#{elb.inspect}'s"} Latency is #{sprintf '%.3f', metric_value} seconds. (expected lower than #{sprintf '%.3f', threshold})"
+                 "; #{elbs.size == 1 ? nil : "#{elb.load_balancer_name}'s"} Latency is #{sprintf '%.3f', metric_value} seconds. (expected lower than #{sprintf '%.3f', threshold})"
       break
     end
   end
 
   def run
     @message = if elbs.size == 1
-                 elbs.first.inspect
+                 elbs.first.load_balancer_name
                else
                  "#{elbs.size} load balancers total"
                end

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

@@ -1,6 +1,6 @@
 module SensuPluginsAWS
   module Version
-    MAJOR = 14
+    MAJOR = 15
     MINOR = 0
     PATCH = 0
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 14.0.0
+  version: 15.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors