sensu-plugins-aws 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d910f32661d096968c169850cc1e4152e26ba551
-  data.tar.gz: ab4e699cff566384ea3d23f3b63c6bfca3d4f2e0
+  metadata.gz: bd94bf1248d6d67b165ad6fb646a250505740e1b
+  data.tar.gz: 4fb80e7ec4923a4cfdb1ee38e497bbc19a7c9227
 SHA512:
-  metadata.gz: 31476cd9c8ea48ec1ffbf4ba175939368efdc3bd580a9dcc3c52929e9e48fee66d233a02de0d66cbeb6f323f694b068de01a710945fabe006ddb82f249c5c754
-  data.tar.gz: e354d8bfd167f4a75b397073afda995a2f416233bd7b7f36b5e0323e063b148137a9273affdef026f5d11060d02b429d27c98a0177cf009acdf99f9e92ff2dd0
+  metadata.gz: 937d38cc131474c8bdcb8e30153235d1a06d2904a94f9fcb9a131081af62a38d49c0680aa486fc0f555b6976f9c6d2aa4a9105df7c1df7f8a4a16d1e26f2ed9c
+  data.tar.gz: 86b253049fd2e5e7fc1ddd1f76b8be25a35398436f9e6c377adce7ff4abdcf9887fde9f562d02734fcef21388a3302cedda140bde416d9b056307c4407dd7760

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [8.1.0] - 2017-08-28
+### Fixed
+check-ebs-burst-limit.rb: Only compare the warning threshold if a `-w` option was specified on the command-line, as usage shows `-w` is optional. (@ivanfetch)
+
+### Added
+- check-ebs-burst-limit.rb: Only check volumes attached to the current instance with a new `-s` option, which also overrides the `-r` option for EC2 region. (@ivanfetch)
+
 ## [8.0.0] - 2017-08-20
 ### Breaking Changes
 - check-beanstalk-elb-metric.rb and check-cloudwatch-metric.rb: `--opertor` flag was a typo, please use `--operator` now. (@guikcd)
@@ -353,6 +360,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/8.0.0...HEAD
+[8.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/8.0.0...8.1.0
 [8.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/7.1.0...8.0.0
 [7.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/7.0.1...7.1.0
 [7.0.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/7.0.0...7.0.1

data/bin/check-ebs-burst-limit.rb

@@ -3,7 +3,8 @@
 # check-ebs-burst-limit
 #
 # DESCRIPTION:
-#   Check EC2 Attached Volumes for volumes with low burst balance
+#   Check EC2 Volumes for volumes with low burst balance
+#   Optionally check only volumes attached to the current instance
 #
 # OUTPUT:
 #   plain-text
@@ -29,6 +30,7 @@
 require 'sensu-plugin/check/cli'
 require 'sensu-plugins-aws'
 require 'aws-sdk'
+require 'net/http'
 
 class CheckEbsBurstLimit < Sensu::Plugin::Check::CLI
   include CloudwatchCommon
@@ -36,7 +38,7 @@ class CheckEbsBurstLimit < Sensu::Plugin::Check::CLI
   option :aws_region,
          short:       '-r R',
          long:        '--region REGION',
-         description: 'AWS region',
+         description: 'AWS region, will be overridden by the -s option',
          default: 'us-east-1'
 
   option :critical,
@@ -52,16 +54,41 @@ class CheckEbsBurstLimit < Sensu::Plugin::Check::CLI
          long: '--warning VALUE',
          proc: proc(&:to_f)
 
+  option :check_self,
+         short: '-s',
+         long: '--check-self',
+         description: 'Only check the instance on which this plugin is being run - this overrides the -r option and uses the region of the current instance',
+         boolean: true,
+         default: false
+
   def run
     errors = []
-    ec2 = Aws::EC2::Client.new
-    volumes = ec2.describe_volumes(
-      filters: [
+
+    # Set the describe-volumes filter depending on whether -s was specified
+    if config[:check_self] == true
+      # Get the region from the availability zone, and override the -r option
+      my_instance_az = Net::HTTP.get(URI.parse('http://169.254.169.254/latest/meta-data/placement/availability-zone'))
+      Aws.config[:region] = my_instance_az.chop
+      my_instance_id = Net::HTTP.get(URI.parse('http://169.254.169.254/latest/meta-data/instance-id'))
+      volume_filters = [
+        {
+          name: 'attachment.instance-id',
+          values: [my_instance_id]
+        }
+      ]
+    else
+      # The -s option was not specified, look at all volumes which are attached
+      volume_filters = [
         {
           name: 'attachment.status',
           values: ['attached']
         }
       ]
+    end
+
+    ec2 = Aws::EC2::Client.new
+    volumes = ec2.describe_volumes(
+      filters: volume_filters
     )
     config[:metric_name] = 'BurstBalance'
     config[:namespace] = 'AWS/EBS'
@@ -78,7 +105,7 @@ class CheckEbsBurstLimit < Sensu::Plugin::Check::CLI
         if resp.datapoints.first[:average] < config[:critical]
           errors << "#{volume[:volume_id]} #{resp.datapoints.first[:average]}"
           crit = true
-        elsif resp.datapoints.first[:average] < config[:warning]
+        elsif config[:warning] && resp.datapoints.first[:average] < config[:warning]
           errors << "#{volume[:volume_id]} #{resp.datapoints.first[:average]}"
           should_warn = true
         end

data/bin/check-elb-health.rb

@@ -16,9 +16,7 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   ./check-ec2-network.rb -r ${you_region} -i ${your_instance_id} --warning-over 1000000 --critical-over 1500000
-#   ./check-ec2-network.rb -r ${you_region} -i ${your_instance_id} -d NetworkIn --warning-over 1000000 --critical-over 1500000
-#   ./check-ec2-network.rb -r ${you_region} -i ${your_instance_id} -d NetworkOut --warning-over 1000000 --critical-over 1500000
+#   ./check-elb-health.rb --elb-name MyELB
 #
 # NOTES:
 #

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

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
     MAJOR = 8
-    MINOR = 0
+    MINOR = 1
     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: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk