sensu-plugins-aws 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bffcd26bc25e27f0c1e85fb9e6736aa748b7e573
-  data.tar.gz: 4ab34c45151793a5a3b367f3325e69f38224fc7f
+  metadata.gz: 0e9b5f1eb3c12c84948ef04dfdccdfbf88fb8a87
+  data.tar.gz: cda4f9fef7a375bf9c55ace21b3b8bd006cbda5c
 SHA512:
-  metadata.gz: 5484677c428d13c79b36b62f6bd86b42c4f50c66b7f24477c91fe6dabc6da67616e89cfc2f2dbdc13ca3dc24431aa6b7297bf2c8b4b4138165030826455657a3
-  data.tar.gz: d673f2d9682d5d90af5e43702e116cd5e2c215104a042824c4e1ba277a3a2ba682b8807571ca77c8ea5ca295e531db55d4a331162c1165067ea862c52ba9971f
+  metadata.gz: f8cd56ed479d985a5d112b3f53fed0b19f8d4dd8c4fb0c8f84d0ea7853608c64e379e88f8d1cc0adfc73b8d1e599983f077cdbb8c6632a7160b2242b1e8c5b06
+  data.tar.gz: d18444784a229eabbeec567ac296181970d7c8243a517a6533840cfe49e6ded4abb761fe276a143711f6502aa321ea7e5bed4c326f98a6bfa72a9436a9652c64

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [7.0.1] - 2017-08-12
+### Fixed
+- check-cloudwatch-metric.rb, check-cloudwatch-composite-metric.rb: fixed defaults to work (@majormoses)
+- check-cloudwatch-metric.rb: short option `-n` was conflicting with `no_data_ok` and `namespace` as `check-cloudwatch-composite-metric.rb` uses `-O` I opted for that for consistency (@majormoses)
+
+### Changed
+- check-cloudwatch-metric.rb, check-cloudwatch-composite-metric.rb: `self.parse_dimensions` and `dimension_string` were the same in both checks This fix was common mamong both checks so I moved it into the module
+
 ## [7.0.0] - 2017-08-07
 ### Breaking Change
 - Bump min dependency on `sensu-plugin` to 2.x (@huynt1979)
@@ -336,7 +344,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/7.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/7.0.1...HEAD
+[7.0.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/7.0.0...7.0.1
 [7.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/6.3.0...7.0.0
 [6.3.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/6.2.0...6.3.0
 [6.2.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/6.1.1...6.2.0

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

@@ -63,8 +63,8 @@ class CloudWatchCompositeMetricCheck < Sensu::Plugin::Check::CLI
          description: 'Comma delimited list of DimName=Value',
          short: '-d DIMENSIONS',
          long: '--dimensions DIMENSIONS',
-         proc: proc { |d| CloudWatchCompositeMetricCheck.parse_dimensions d },
-         default: ''
+         proc: proc { |d| CloudwatchCommon.parse_dimensions d },
+         default: []
 
   option :period,
          description: 'CloudWatch metric statistics period. Must be a multiple of 60',
@@ -112,16 +112,6 @@ class CloudWatchCompositeMetricCheck < Sensu::Plugin::Check::CLI
 
   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

data/bin/check-cloudwatch-metric.rb

@@ -54,8 +54,8 @@ class CloudWatchMetricCheck < Sensu::Plugin::Check::CLI
          description: 'Comma delimited list of DimName=Value',
          short: '-d DIMENSIONS',
          long: '--dimensions DIMENSIONS',
-         proc: proc { |d| CloudWatchMetricCheck.parse_dimensions d },
-         default: ''
+         proc: proc { |d| CloudwatchCommon.parse_dimensions d },
+         default: []
 
   option :period,
          description: 'CloudWatch metric statistics period. Must be a multiple of 60',
@@ -95,7 +95,7 @@ class CloudWatchMetricCheck < Sensu::Plugin::Check::CLI
          default: 'greater'
 
   option :no_data_ok,
-         short: '-n',
+         short: '-O',
          long: '--allow-no-data',
          description: 'Returns ok if no data is returned from the metric',
          boolean: true,

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

@@ -83,6 +83,16 @@ module CloudwatchCommon
     end
   end
 
+  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 check(config)
     resp = client.get_metric_statistics(metrics_request(config))
 

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

@@ -2,7 +2,7 @@ module SensuPluginsAWS
   module Version
     MAJOR = 7
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk