sensu-plugins-aws 10.2.0 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a16969efd75d8180a047d23203b50d8def65e1fa1195c0d9aa01ad33d0fac551
-  data.tar.gz: 27dfefdff63801d47729edc185c112d1bc78027760338442b914431b75446d04
+  metadata.gz: cf38e747e9eacaf74e5266c61fb6425729e033b72258e95a97c2c2c3bfafaa6e
+  data.tar.gz: ac749130f70447fc122f00613424793ea1f699184bccc1bee71de020a75c0c84
 SHA512:
-  metadata.gz: 40bb528c7369ebac03a58c8a550c9cf691996bd1cb35d48e5c82907033c342abb611129cd95a76e8653d7e9d17644e71d71a7cbb26a026f1c8ea84e90acee557
-  data.tar.gz: 840436086db63a6e42b8c86d51c30c92d942efb25f2cd8451d199cc07f7205ec7a0a98a8d24f3ed71585a88349d05c19dd29bd520df2444f548bdb74c86f7eb6
+  metadata.gz: 88e750cb8957949dcf0d9d235f182e5327841b9dac8aa0fe53689012a2a7dbd6c49d4f5591d95284175d45aaff0a66115b7569ba4e7bcd05841937a348598447
+  data.tar.gz: b923084b699ebb9a26ac5e11632573a79d9ff432b6de1b5434d2ca027283d017ae611517981b6656435bf5a5f7d83232c39e4fc44dfc1fdac63db71b185c1854

data/CHANGELOG.md

@@ -5,6 +5,15 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [11.0.0] - 2018-02-09
+### Breaking Changes
+- metrics-elb-full.rb: removed in favor of metrics-elb.rb, which is slightly more configurable and uses the AWS-SDK v2 already. Compared to metrics-elb-full.rb, metrics-elb.rb no longer takes --aws-access-key, --aws-secret-access-key flags, Authentication should be configured per [here](https://github.com/sensu-plugins/sensu-plugins-aws/blob/master/README.md#authentication). --scheme has a default value of `elb` now (@multani)
+- metrics-elb.rb: honors the --fetch_age flag which now looks up values 60 seconds in the past by default. This was the intended behavior, as documented in the NOTES section (@multani)
+- metrics-elb.rb: --scheme default value is `elb` now, to be more consistent with the other metrics checks (@multani)
+
+### Fixed
+- metrics-elb.rb: properly handle the --scheme and --fetch_age flags (@multani)
+
 ## [10.2.0] - 2018-01-20
 ### Added
 - `check-s3-bucket-visiblity.rb` - checks an S3 bucket for existence of a website configuration or bucket policy containing `Get*`,
@@ -427,7 +436,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/10.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/11.0.0...HEAD
+[11.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.2.0...11.0.0
 [10.2.0]:https://github.com/sensu-plugins/sensu-plugins-aws/compare/10.1.2...10.2.0
 [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

data/bin/metrics-elb.rb

@@ -52,7 +52,7 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-s SCHEME',
          long: '--scheme SCHEME',
-         default: ''
+         default: 'elb'
 
   option :fetch_age,
          description: 'How long ago to fetch metrics for',
@@ -106,8 +106,8 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
         }
       ],
       statistics: [value],
-      start_time: config[:end_time] - config[:period],
-      end_time: config[:end_time],
+      start_time: config[:end_time] - config[:fetch_age] - config[:period],
+      end_time: config[:end_time] - config[:fetch_age],
       period: config[:period]
     )
   end
@@ -117,8 +117,16 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
     static_value = {}
     statistics.each do |key, static|
       r = cloud_watch_metric(key, static, load_balancer_name)
-      static_value['loadbalancer.' + load_balancer_name + '.' + key + '.' + static] = static
-      result['loadbalancer.' + load_balancer_name + '.' + key + '.' + static] = r[:datapoints][0] unless r[:datapoints][0].nil?
+      keys = if config[:scheme] == ''
+               []
+             else
+               [config[:scheme]]
+             end
+      keys.concat [load_balancer_name, key, static]
+      metric_key = keys.join('.')
+
+      static_value[metric_key] = static
+      result[metric_key] = r[:datapoints][0] unless r[:datapoints][0].nil?
     end
     result.each do |key, value|
       output key.downcase.to_s, value[static_value[key].downcase], value[:timestamp].to_i

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

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
-    MAJOR = 10
-    MINOR = 2
+    MAJOR = 11
+    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: 10.2.0
+  version: 11.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -326,7 +326,6 @@ executables:
 - metrics-ec2-count.rb
 - metrics-ec2-filter.rb
 - metrics-elasticache.rb
-- metrics-elb-full.rb
 - metrics-elb.rb
 - metrics-emr-steps.rb
 - metrics-rds.rb
@@ -409,7 +408,6 @@ files:
 - bin/metrics-ec2-count.rb
 - bin/metrics-ec2-filter.rb
 - bin/metrics-elasticache.rb
-- bin/metrics-elb-full.rb
 - bin/metrics-elb.rb
 - bin/metrics-emr-steps.rb
 - bin/metrics-rds.rb
@@ -447,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with an AWS environment

data/bin/metrics-elb-full.rb

@@ -1,145 +0,0 @@
-#! /usr/bin/env ruby
-#
-# elb-full-metrics
-#
-# DESCRIPTION:
-#   Gets latency metrics from CloudWatch and puts them in Graphite for longer term storage
-#
-# OUTPUT:
-#   metric-data
-#
-# PLATFORMS:
-#   Linux
-#
-# DEPENDENCIES:
-#   gem: aws-sdk-v1
-#   gem: sensu-plugin
-#
-# USAGE:
-#   #YELLOW
-#
-# NOTES:
-#   Returns latency statistics by default.  You can specify any valid ELB metric type, see
-#   http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html#elb-metricscollected
-#
-#   By default fetches statistics from one minute ago.  You may need to fetch further back than this;
-#   high traffic ELBs can sometimes experience statistic delays of up to 10 minutes.  If you experience this,
-#   raising a ticket with AWS support should get the problem resolved.
-#   As a workaround you can use eg -f 300 to fetch data from 5 minutes ago.
-#
-# LICENSE:
-#   Copyright 2013 Bashton Ltd http://www.bashton.com/
-#   Released under the same terms as Sensu (the MIT license); see LICENSE
-#   for details.
-#
-
-require 'sensu-plugin/metric/cli'
-require 'aws-sdk-v1'
-
-class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
-  option :elbname,
-         description: 'Name of the Elastic Load Balancer (separate with commas for multiple ELBs)',
-         short: '-n ELB_NAME',
-         long: '--name ELB_NAME',
-         required: true
-
-  option :scheme,
-         description: 'Metric naming scheme, text to prepend to metric',
-         short: '-s SCHEME',
-         long: '--scheme SCHEME',
-         default: ''
-
-  option :fetch_age,
-         description: 'How long ago to fetch metrics for',
-         short: '-f AGE',
-         long: '--fetch_age',
-         default: 60,
-         proc: proc(&:to_i)
-
-  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']
-
-  option :aws_region,
-         short: '-r AWS_REGION',
-         long: '--aws-region REGION',
-         description: 'AWS Region (defaults to us-east-1).',
-         default: 'us-east-1'
-
-  def aws_config
-    { access_key_id: config[:aws_access_key],
-      secret_access_key: config[:aws_secret_access_key],
-      region: config[:aws_region] }
-  end
-
-  def run
-    statistic_type = {
-      'Latency' => 'Average',
-      'RequestCount' => 'Sum',
-      'UnHealthyHostCount' => 'Average',
-      'HealthyHostCount' => 'Average',
-      'HTTPCode_Backend_2XX' => 'Sum',
-      'HTTPCode_Backend_3XX' => 'Sum',
-      'HTTPCode_Backend_4XX' => 'Sum',
-      'HTTPCode_Backend_5XX' => 'Sum',
-      'HTTPCode_ELB_4XX' => 'Sum',
-      'HTTPCode_ELB_5XX' => 'Sum',
-      'BackendConnectionErrors' => 'Sum',
-      'SurgeQueueLength' => 'Maximum',
-      'SpilloverCount' => 'Sum'
-    }
-
-    begin
-      et = Time.now - config[:fetch_age]
-      st = et - 60
-
-      cw = AWS::CloudWatch::Client.new aws_config
-
-      options = {
-        'namespace' => 'AWS/ELB',
-        'dimensions' => [
-          {
-            'name' => 'LoadBalancerName',
-            'value' => nil
-          }
-        ],
-        'start_time' => st.iso8601,
-        'end_time' => et.iso8601,
-        'period' => 60
-      }
-      config[:elbname].split(',').each do |elbname|
-        graphitepath = if config[:scheme] == ''
-                         elbname.to_s
-                       else
-                         "#{config[:scheme]}.#{elbname}"
-                       end
-        result = {}
-        statistic_type.each do |key, value|
-          options['metric_name'] = key
-          options['dimensions'][0]['value'] = elbname
-          options['statistics'] = [value]
-          r = cw.get_metric_statistics(options)
-          result[key] = r[:datapoints][0] unless r[:datapoints][0].nil?
-        end
-
-        # We only return data when we have some to return
-        next if result.nil?
-        result.each do |key, value|
-          puts key, value
-          output graphitepath + ".#{key}", value[:sum] || value[:average], value[:timestamp].to_i
-        end
-      end
-    rescue StandardError => e
-      critical "Error: exception: #{e}"
-    end
-    ok
-  end
-end