sensu-plugins-aws 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd1f6a42abd1a5201a34df72564a7774a7f3c29
-  data.tar.gz: 38cf5c5cc6c757dcef503d825c50938ef02f2158
+  metadata.gz: 3d3bd06b2e135c2aa0476252fb837eb022432933
+  data.tar.gz: f8fa65a2aac1d049b5e2fe160c5c9025a6e579be
 SHA512:
-  metadata.gz: c56ed6c76d340f357509aae2676c0b0a1aac1ebff884aa71d50b3332207887c70102255885ea4359a320fbd7dc8bec463e0002baa23aaa35e6894e93a2176d72
-  data.tar.gz: ca41201cc25e0ba58658c5bdedf4717c6d8150fdcd5fd8f0d790ce4f8f4dacfe3f7fd6eea3cbb8996347cdb754be8104ae95ab6842c5212af3f2ec5e25bf10f4
+  metadata.gz: ee628849a14a95a447b7bc7d776bc92966d4772a4e3a4fe094c9e5905a5e6c5665974ecd0ee6a6e1df17287c84a0e3f989a410d5d33fe5a46780e27771a8a26f
+  data.tar.gz: ae0efd4a9705832898109d163d552251e5fa77bbe32c61b51ed79282b6ededd9ddd1a9d657b0e60ac0d1aea71a8c9dd77118609ccdbb1278c3cee7beebf88313

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [5.0.0] - 2017-05-03
+### Breaking Change
+- removed check_vpc_vpn.py as it is broken and not worth fixing when `check-vpc-vpn.rb` is the direction forward. (@majormoses)
+
+### Fixed
+- check-instance-health.rb now supports checking more than 100 instances (aws api limit) by batching into multiple requests if needed. (@majormoses)
+- check-elb-fog.rb set the variable name fog expects (@majormoses)
+
 ## [4.1.0] - 2017-05-01
 ###  Added
 - check-cloudwatch-composite-metric.rb: Allow calculation of percentage for cloudwatch metrics  by composing two metrics (@cornelf) (numerator_metric/denominator_metric * 100) as a percentage. This is useful to skip pushing such metrics to graphite in order to get the percentage metric computed.
@@ -289,7 +297,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/4.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.0.0...HEAD
+[5.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.0.0...4.1.0
 [4.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/4.1.0...4.0.0
 [4.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.2.1...4.0.0
 [3.2.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.2.0...3.2.1

data/README.md

@@ -104,8 +104,6 @@
 
 **check-vpc-nameservers**
 
-**check_vpc_vpn.py**
-
 **check-instances-count.rb**
 
 **check-vpc-vpn.rb**

data/bin/check-elb-health-fog.rb

@@ -81,8 +81,8 @@ class ELBHealth < Sensu::Plugin::Check::CLI
   end
 
   def aws_config
-    { access_key_id: config[:aws_access_key],
-      secret_access_key: config[:aws_secret_access_key],
+    { aws_access_key_id: config[:aws_access_key],
+      aws_secret_access_key: config[:aws_secret_access_key],
       region: config[:aws_region] }
   end
 

data/bin/check-instance-health.rb

@@ -75,19 +75,24 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
     end
 
     begin
-      resp = ec2.describe_instance_status(instance_ids: instance_ids)
-      resp.instance_statuses.each do |item|
-        id = item.instance_id
-        if gather_events(item.events)
-          messages << "#{id} has unscheduled events"
-        end
+      resp = []
+      instance_ids.each_slice(100) do |batch|
+        resp << ec2.describe_instance_status(instance_ids: batch)
+      end
+      resp.each do |r|
+        r.instance_statuses.each do |item|
+          id = item.instance_id
+          if gather_events(item.events)
+            messages << "#{id} has unscheduled events"
+          end
 
-        if gather_status(item.system_status)
-          messages << "#{id} has failed system status checks"
-        end
+          if gather_status(item.system_status)
+            messages << "#{id} has failed system status checks"
+          end
 
-        if gather_status(item.instance_status)
-          messages << "#{id} has failed instance status checks"
+          if gather_status(item.instance_status)
+            messages << "#{id} has failed instance status checks"
+          end
         end
       end
     rescue => e

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

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
-    MAJOR = 4
-    MINOR = 1
+    MAJOR = 5
+    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: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.32.0
+- !ruby/object:Gem::Dependency
+  name: fog-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.43.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.43.0
 - !ruby/object:Gem::Dependency
   name: right_aws
   requirement: !ruby/object:Gem::Requirement
@@ -376,7 +390,6 @@ files:
 - bin/check-trustedadvisor-service-limits.rb
 - bin/check-vpc-nameservers.rb
 - bin/check-vpc-vpn.rb
-- bin/check_vpc_vpn.py
 - bin/handler-ec2_node.rb
 - bin/handler-scale-asg-down.rb
 - bin/handler-scale-asg-up.rb

data/bin/check_vpc_vpn.py

@@ -1,42 +0,0 @@
-#!/usr/bin/python
-
-# #RED
-import argparse
-import boto.ec2
-from boto.vpc import VPCConnection
-import sys
-
-
-def main():
-    try:
-        conn = boto.vpc.VPCConnection(aws_access_key_id=args.aws_access_key_id, aws_secret_access_key=args.aws_secret_access_key, region=boto.ec2.get_region(args.region))
-    except:
-        print "UNKNOWN: Unable to connect to reqion %s" % args.region
-        sys.exit(3)
-
-    errors = []
-    for vpn_connection in conn.get_all_vpn_connections():
-        for tunnel in vpn_connection.tunnels:
-            if tunnel.status != 'UP':
-                errors.append("[gateway: %s connection: %s tunnel: %s status: %s]" % (vpn_connection.vpn_gateway_id, vpn_connection.id, tunnel.outside_ip_address, tunnel.status))
-
-    if len(errors) > 1:
-        print 'CRITICAL: ' + ' '.join(errors)
-        sys.exit(2)
-    elif len(errors) > 0:
-        print 'WARN: ' + ' '.join(errors)
-        sys.exit(1)
-    else:
-        print 'OK'
-        sys.exit(0)
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Check status of all existing AWS VPC VPN Tunnels')
-
-    parser.add_argument('-a', '--aws-access-key-id', required=True, dest='aws_access_key_id', help='AWS Access Key')
-    parser.add_argument('-s', '--aws-secret-access-key', required=True, dest='aws_secret_access_key', help='AWS Secret Access Key')
-    parser.add_argument('-r', '--region', required=True, dest='region', help='AWS Region')
-
-    args = parser.parse_args()
-
-    main()