sensu-plugins-aws 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1510edf78fde0477592736fb6a25174068aea6f
-  data.tar.gz: 3230a421cb5f4f07c7c8697b68500e9de59a480e
+  metadata.gz: d8e18850d95e6ba9318753d772c1e47a27a869ea
+  data.tar.gz: 7183226959ec68b20c3d10b6c389a657ed5673bc
 SHA512:
-  metadata.gz: ad8f2bbd6f05d6333383f53d8c0ab50922fad826c73e83c308042bf308c96eaa64f8b9effd80522a28922d201535ef2e0824d70ddfa6220dd8027ce7d2edcb6c
-  data.tar.gz: a47164e6147c093b74ac78d41df199ad1cfed09a7643e6e255647cb8c869f6a25b2175103caf96226955c0b2f90422aae7c0c40f34a328a242b7bfb0977a887b
+  metadata.gz: 001e818b18007dd33efbee3c123b04963803dd4d2906065c638107ac5fc6ea73cd533bf680d61c6a946ee9e2f25f9d9f12344683e9c8ad87586c4df60ba7c1f6
+  data.tar.gz: 8c61028e2fe855c90d9c9c6106822e1ae3045ed4f67bc953444cc9ec777f24b5579681d625a27e20877c5dce962792deee88aa538659f7003bf76c3a28939e5b

data/CHANGELOG.md

@@ -3,7 +3,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## [1.1.0] - 2015-07-24 
+## [1.2.0] - 2015-08-04
+### Added
+- Added check-ec2-filter to compare filter results to given thresholds
+- Added check-vpc-nameservers, which given a VPC will validate the name servers in the DHCP option set.
+
+### Fixed
+- handler-ec2_node accounts for an empty instances array
+
+## [1.1.0] - 2015-07-24
 ### Added
 - Added new AWS SES handler - handler-ses.rb
 - Add metrics-ec2-filter to store node ids and count matching a given filter
@@ -20,6 +28,7 @@ WARNING:  This release contains major breaking changes that will impact all user
 - Added support for checking multiple ELB instances at once by passing a comma separated list of ELB instance names in metrics-elb-full.rb
 - Added check-autoscaling-cpucredits.rb for checking T2 instances in autoscaling groups that are running low on CPU credits
 - Updated the fog and aws-sdk gems to the latest versions to improve performance, reduce 3rd party gem dependencies, and add support for newer AWS features.
+- Add metrics-ec2-filter to store node ids and count matching a given filter
 
 ### Fixed
 - Renamed autoscaling-instance-count-metrics.rb -> metrics-autoscaling-instance-count.rb to match our naming scheme

data/README.md

@@ -17,6 +17,8 @@
 
 **check-ebs-snapshots.rb**
 
+**check-ec2-filter.rb**
+
 **check-ec2-network.rb**
 
 **check-eip-allocation.rb**
@@ -47,6 +49,8 @@
 
 **check-sqs-messages.rb**
 
+**check-vpc-nameservers**
+
 **check_vpc_vpn.py**
 
 **handler-ec2_node.rb**
@@ -76,6 +80,7 @@
 * /bin/check-dynamodb-capacity.rb
 * /bin/check-dynamodb-throttle.rb
 * /bin/check-ebs-snapshots.rb
+* /bin/check-ec2-filter.rb
 * /bin/check-ec2-network.rb
 * /bin/check-elb-certs.rb
 * /bin/check-elb-health-fog.rb
@@ -90,6 +95,7 @@
 * /bin/check-redshift-events.rb
 * /bin/check-ses-limit.rb
 * /bin/check-sqs-messages.rb
+* /bin/check-vpc-nameservers.rb
 * /bin/check_vpc_vpn.py
 * /bin/handler-ec2_node.rb
 * /bin/handler-ses.rb

data/bin/check-ec2-filter.rb

@@ -0,0 +1,147 @@
+#! /usr/bin/env ruby
+#
+# check-ec2-filter
+#
+# DESCRIPTION:
+#   This plugin retrieves EC2 instances matching a given filter and
+#   returns the number matched. Warning and Critical thresholds may be set as needed.
+#   Thresholds may be compared to the count using [equal, not, greater, less] operators.
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-ec2-filter.rb -w 20 -f "{name:tag-value,values:[infrastructure]}"
+#   ./check-ec2-filter.rb -w 10 -c 5 -o less -f "{name:tag-value,values:[infrastructure]} {name:instance-state-name,values:[running]}"
+#
+# NOTES:
+#
+# LICENSE:
+#   Justin McCarty
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'aws-sdk'
+require 'sensu-plugins-aws/filter'
+
+class EC2Filter < Sensu::Plugin::Check::CLI
+  include Filter
+  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'
+
+  option :name,
+         description: 'Filter naming scheme, text to prepend to metric',
+         short: '-n NAME',
+         long: '--name NAME',
+         default: ''
+
+  option :filter,
+         short: '-f FILTER',
+         long: '--filter FILTER',
+         description: 'String representation of the filter to apply',
+         default: '{}'
+
+  option :warning,
+         description: 'Warning threshold for filter',
+         short: '-w COUNT',
+         long: '--warning COUNT'
+
+  option :critical,
+         description: 'Critical threshold for filter',
+         short: '-c COUNT',
+         long: '--critical COUNT'
+
+  option :compare,
+         description: 'Comparision operator for threshold: equal, not, greater, less',
+         short: '-o OPERATION',
+         long: '--opertor OPERATION',
+         default: 'equal'
+
+  def aws_config
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
+  end
+
+  def convert_operator
+    op =  ->(c, t) { c == t }
+
+    if config[:compare] == 'greater'
+      op = ->(c, t) { c > t }
+    elsif config[:compare] == 'less'
+      op = ->(c, t) { c < t }
+    elsif config[:compare] == 'not'
+      op = ->(c, t) { c != t }
+    end
+
+    op
+  end
+
+  def run
+    client = Aws::EC2::Client.new aws_config
+
+    filter = Filter.parse(config[:filter])
+
+    if filter.empty?
+      options = {}
+    else
+      options = { filters: filter }
+    end
+
+    data = client.describe_instances(options)
+
+    instance_ids = Set.new
+
+    data[:reservations].each do |res|
+      res[:instances].each do |i|
+        instance_ids << i[:instance_id]
+      end
+    end
+
+    count = instance_ids.count
+    op = convert_operator
+    message = "Current count: #{count}"
+
+    unless config[:critical].nil?
+      if op.call count, config[:critical].to_i
+        critical message
+      end
+    end
+
+    unless config[:warning].nil?
+      if op.call count, config[:warning].to_i
+        warning message
+      end
+    end
+
+    ok message
+  rescue => e
+    puts "Error: exception: #{e}"
+    critical
+  end
+end

data/bin/check-vpc-nameservers.rb

@@ -0,0 +1,87 @@
+#! /usr/bin/env ruby
+#
+# check-vpc-nameservers
+#
+# DESCRIPTION:
+#   Checks the VPCs nameservers are functional
+#
+# OUTPUT:
+#   plain-text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: aws-sdk
+#   gem: sensu-plugin
+#
+# USAGE:
+#   ./check-vpc-nameservers.rb -v vpc-12345678
+#   ./check-vpc-nameservers.rb -v vpc-12345678 -r us-east-1
+#   ./check-vpc-nameservers.rb -v vpc-12345678 -r us-east-1 -q google.com,internal.private.servers
+#
+# NOTES:
+#
+# LICENSE:
+#   Shane Starcher <shane.starcher@gmail.com>
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+require 'sensu-plugin/check/cli'
+require 'sensu-plugins-aws'
+require 'aws-sdk'
+require 'resolv'
+
+class CheckVpcNameservers < Sensu::Plugin::Check::CLI
+  include Common
+  option :queries,
+         short:       '-q queries',
+         long:        '--queries google.com,example1.com',
+         proc:        proc { |a| a.split(',') },
+         default:     ['google.com'],
+         description: 'Comma seperated dns queries to test'
+
+  option :vpc_id,
+         short:       '-v vpc_id',
+         long:        '--vpc_id vpc-12345678',
+         required:    true,
+         description: 'The vpc_id of the dhcp option set'
+
+  option :aws_region,
+         short:       '-r R',
+         long:        '--region REGION',
+         description: 'AWS region',
+         default: 'us-east-1'
+
+  def run
+    errors = []
+    ec2 = Aws::EC2::Client.new
+
+    dhcp_option_id = ec2.describe_vpcs(vpc_ids: [config[:vpc_id]]).vpcs[0].dhcp_options_id
+
+    options = ec2.describe_dhcp_options(dhcp_options_ids: [dhcp_option_id])
+
+    options.dhcp_options.each do |option|
+      option.dhcp_configurations.each do |map|
+        next if map.key != 'domain-name-servers'
+        map.values.each do |value|
+          ip = value.value
+          config[:queries].each do |query|
+            begin
+              Resolv::DNS.open(nameserver: [ip]).getaddress(query)
+            rescue Resolv::ResolvError => res_err
+              errors << "[#{ip}] #{res_err} "
+            end
+          end
+        end
+      end
+    end
+
+    if errors.empty?
+      ok
+    else
+      warning errors.join("\n")
+    end
+  end
+end

data/bin/handler-ec2_node.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 #
 # CHANGELOG:
+# * 0.6.0:
+#   - Fixed ec2_node_should_be_deleted to account for an empty insances array
 # * 0.5.0:
 #   - Adds configuration to filter by state reason
 # * 0.4.0:
@@ -130,7 +132,7 @@ class Ec2Node < Sensu::Handler
     states = @event['client']['ec2_states'] || settings['ec2_node']['ec2_states'] || ['shutting-down', 'terminated', 'stopping', 'stopped']
     begin
       instances = ec2.describe_instances(instance_ids: [@event['client']['name']]).reservations[0]
-      if instances.nil?
+      if instances.nil? || instances.empty?
         true
       else
         instance = instances.instances[0]

data/bin/metrics-ec2-filter.rb

@@ -29,8 +29,10 @@
 
 require 'sensu-plugin/metric/cli'
 require 'aws-sdk'
+require 'sensu-plugins-aws/filter'
 
 class EC2Filter < Sensu::Plugin::Metric::CLI::Graphite
+  include Filter
   option :aws_access_key,
          short: '-a AWS_ACCESS_KEY',
          long: '--aws-access-key AWS_ACCESS_KEY',
@@ -74,35 +76,11 @@ class EC2Filter < Sensu::Plugin::Metric::CLI::Graphite
     }
   end
 
-  def convert_filter(input)
-    filter = []
-    items = input.scan(/{.*?}/)
-
-    items.each do |item|
-      if item.strip.empty?
-        fail 'Invalid filter syntax'
-      end
-
-      entry = {}
-      name = item.scan(/name:(.*?),/)
-      value = item.scan(/values:\[(.*?)\]/)
-
-      if name.nil? || name.empty? || value.nil? || value.empty?
-        fail 'Unable to parse filter entry'
-      end
-
-      entry[:name] = name[0][0].strip
-      entry[:values] = value[0][0].split(',')
-      filter << entry
-    end
-    filter
-  end
-
   def run
     begin
       client = Aws::EC2::Client.new aws_config
 
-      filter = convert_filter(config[:filter])
+      filter = Filter.parse(config[:filter])
 
       options = { filters: filter }
 

data/lib/sensu-plugins-aws.rb

@@ -1,3 +1,4 @@
 
 require 'sensu-plugins-aws/version'
 require 'sensu-plugins-aws/common'
+require 'sensu-plugins-aws/filter'

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

@@ -0,0 +1,47 @@
+#
+# DESCRIPTION:
+#   Filter methods for aws quieries
+#
+# DEPENDENCIES:
+#
+# USAGE:
+#   Filter.parse(string)
+#
+# NOTES:
+#
+# LICENSE:
+#   Justin McCarty (jmccarty3@gmail.com)
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+
+module Filter
+  def self.parse(input)
+    filter = []
+
+    if input == '{}'
+      return filter
+    end
+
+    items = input.scan(/{.*?}/)
+
+    items.each do |item|
+      if item.strip.empty?
+        fail 'Invalid filter syntax'
+      end
+
+      entry = {}
+      name = item.scan(/name:(.*?),/)
+      value = item.scan(/values:\[(.*?)\]/)
+
+      if name.nil? || name.empty? || value.nil? || value.empty?
+        fail 'Unable to parse filter entry'
+      end
+
+      entry[:name] = name[0][0].strip
+      entry[:values] = value[0][0].split(',')
+      filter << entry
+    end
+    filter
+  end
+end

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

@@ -5,7 +5,7 @@ module SensuPluginsAWS
   # This defines the version of the gem
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     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: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -242,6 +242,7 @@ executables:
 - handler-ses.rb
 - handler-ec2_node.rb
 - check_vpc_vpn.py
+- check-vpc-nameservers.rb
 - check-sqs-messages.rb
 - check-ses-limit.rb
 - check-redshift-events.rb
@@ -257,6 +258,7 @@ executables:
 - check-elb-certs.rb
 - check-eip-allocation.rb
 - check-ec2-network.rb
+- check-ec2-filter.rb
 - check-ebs-snapshots.rb
 - check-dynamodb-throttle.rb
 - check-dynamodb-capacity.rb
@@ -271,6 +273,7 @@ files:
 - bin/check-dynamodb-capacity.rb
 - bin/check-dynamodb-throttle.rb
 - bin/check-ebs-snapshots.rb
+- bin/check-ec2-filter.rb
 - bin/check-ec2-network.rb
 - bin/check-eip-allocation.rb
 - bin/check-elb-certs.rb
@@ -286,6 +289,7 @@ files:
 - bin/check-redshift-events.rb
 - bin/check-ses-limit.rb
 - bin/check-sqs-messages.rb
+- bin/check-vpc-nameservers.rb
 - bin/check_vpc_vpn.py
 - bin/handler-ec2_node.rb
 - bin/handler-ses.rb
@@ -299,6 +303,7 @@ files:
 - bin/metrics-sqs.rb
 - lib/sensu-plugins-aws.rb
 - lib/sensu-plugins-aws/common.rb
+- lib/sensu-plugins-aws/filter.rb
 - lib/sensu-plugins-aws/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-aws
 licenses:
@@ -326,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with an AWS environment