sensu-plugins-aws 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0931032c4f8da410ca8c93791c46ed5ed1a405
-  data.tar.gz: 9b2f815e235e497dabce48338471af181ff6fec4
+  metadata.gz: 8685159465ac57fb22fba51ba9028b291f109286
+  data.tar.gz: 68bf94f2885d00593513c1add14815882ca13af8
 SHA512:
-  metadata.gz: f7ae3f4a0d297431cf67009c1f4234212ae790d89d947476c1f0a9ac12fb3784074dafcb71b0d17c1fbe1e3525603930167af6f1adb6edbbee9df9caeef4e89c
-  data.tar.gz: 262bc5237133233f35c402a3f1cdf147634b9d44961caf537e60bd49874e1ad5cdd0de23b0be9b0bcdefc0a532b0b2209e236339f377fca99f8c103cef79587f
+  metadata.gz: 9db0befbb10fd44f56e4b5319c93106c11cffbbae69a8309bae5cad2c5af8b693be5b613fe518cdfa163bef82e20d5e1751db1c271e2b795818365d3df0c2fd0
+  data.tar.gz: 550d5684866df994929f803729699d9684366bcd2a037d2444f915c9942772ac5013497f19926b278cbf483dba71b0a3fc0e05383696a6f2c42dec373fb2dcae

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [8.3.0] - 2017-09-16
+### Added
+- check-ec2-cpu_balance.rb: Add option `--tag`/`-t` to add a specified instace tag (e.g. instace name) to message. (@snadorp)
+
 ## [8.2.0] - 2017-09-05
 ### Added
 - metrics-rds.rb: adding option `--scheme` to allow changing the default scheme (@julio-ogury)
@@ -363,7 +367,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/8.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/8.3.0...HEAD
+[8.3.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/8.2.0...8.3.0
 [8.2.0]:https://github.com/sensu-plugins/sensu-plugins-aws/compare/8.1.0...8.2.0
 [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

data/bin/check-ec2-cpu_balance.rb

@@ -17,6 +17,8 @@
 #
 # USAGE:
 #   ./check-ec2-cpu_balance -c 20
+#   ./check-ec2-cpu_balance -w 25 -c 20
+#   ./check-ec2-cpu_balance -c 20 -t 'Name'
 #
 # NOTES:
 #
@@ -52,6 +54,11 @@ class EC2CpuBalance < Sensu::Plugin::Check::CLI
          description: 'AWS region',
          default: 'us-east-1'
 
+  option :tag,
+         description: 'Add instance TAG value to warn/critical message.',
+         short: '-t TAG',
+         long: '--tag TAG'
+
   def data(instance)
     client = Aws::CloudWatch::Client.new
     stats = 'Average'
@@ -59,10 +66,12 @@ class EC2CpuBalance < Sensu::Plugin::Check::CLI
     resp = client.get_metric_statistics(
       namespace: 'AWS/EC2',
       metric_name: 'CPUCreditBalance',
-      dimensions: [{
-        name: 'InstanceId',
-        value: instance
-      }],
+      dimensions: [
+        {
+          name: 'InstanceId',
+          value: instance
+        }
+      ],
       start_time: Time.now - period * 10,
       end_time: Time.now,
       period: period,
@@ -72,6 +81,11 @@ class EC2CpuBalance < Sensu::Plugin::Check::CLI
     return resp.datapoints.first.send(stats.downcase) unless resp.datapoints.first.nil?
   end
 
+  def instance_tag(instance, tag_name)
+    tag = instance.tags.select { |t| t.key == tag_name }.first
+    tag.nil? ? '' : tag.value
+  end
+
   def run
     ec2 = Aws::EC2::Client.new
     instances = ec2.describe_instances(
@@ -90,13 +104,14 @@ class EC2CpuBalance < Sensu::Plugin::Check::CLI
         next unless instance.instance_type.start_with? 't2.'
         id = instance.instance_id
         result = data id
+        tag = config[:tag] ? " (#{instance_tag(instance, config[:tag])})" : ''
         unless result.nil?
           if result < config[:critical]
             level = 2
-            messages << "#{id} is below critical threshold [#{result} < #{config[:critical]}]\n"
+            messages << "#{id}#{tag} is below critical threshold [#{result} < #{config[:critical]}]\n"
           elsif config[:warning] && result < config[:warning]
             level = 1 if level == 0
-            messages << "#{id} is below warning threshold [#{result} < #{config[:warning]}]\n"
+            messages << "#{id}#{tag} is below warning threshold [#{result} < #{config[:warning]}]\n"
           end
         end
       end

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

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
     MAJOR = 8
-    MINOR = 2
+    MINOR = 3
     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.2.0
+  version: 8.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -256,82 +256,82 @@ description: |-
                                 for EC2, SES, and SNS.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-elb-latency.rb
-- check-rds-pending.rb
-- metrics-rds.rb
+- check-alb-target-group-health.rb
+- check-asg-instances-created.rb
+- check-asg-instances-inservice.rb
+- check-autoscaling-cpucredits.rb
+- check-beanstalk-elb-metric.rb
+- check-beanstalk-health.rb
+- check-certificate-expiry.rb
+- check-cloudfront-tag.rb
+- check-cloudwatch-alarm.rb
+- check-cloudwatch-alarms.rb
+- check-cloudwatch-composite-metric.rb
 - check-cloudwatch-metric.rb
 - check-configservice-rules.rb
-- check-elb-certs.rb
-- metrics-elb-full.rb
-- check-ses-statistics.rb
-- check-reserved-instances.rb
-- check-cloudwatch-alarms.rb
-- check-emr-steps.rb
-- check-elb-instances-inservice.rb
+- check-dynamodb-capacity.rb
 - check-dynamodb-throttle.rb
-- check-s3-object.rb
-- handler-scale-asg-up.rb
+- check-ebs-burst-limit.rb
+- check-ebs-snapshots.rb
+- check-ec2-cpu_balance.rb
+- check-ec2-filter.rb
+- check-ec2-network.rb
+- check-ecs-service-health.rb
+- check-eip-allocation.rb
+- check-elasticache-failover.rb
+- check-elb-certs.rb
+- check-elb-health-fog.rb
 - check-elb-health-sdk.rb
-- metrics-sqs.rb
-- check-vpc-nameservers.rb
-- check-eni-status.rb
-- check-s3-tag.rb
-- check-rds.rb
-- check-cloudwatch-composite-metric.rb
+- check-elb-health.rb
+- check-elb-instances-inservice.rb
+- check-elb-latency.rb
+- check-elb-nodes.rb
 - check-elb-sum-requests.rb
-- metrics-asg.rb
-- check-instances-count.rb
+- check-emr-cluster.rb
+- check-emr-steps.rb
+- check-eni-status.rb
+- check-instance-events.rb
 - check-instance-health.rb
-- metrics-ec2-filter.rb
-- check-route53-domain-expiration.rb
-- check-elb-health.rb
-- check-beanstalk-elb-metric.rb
-- check-eip-allocation.rb
+- check-instance-reachability.rb
+- check-instances-count.rb
 - check-kms-key.rb
-- check-dynamodb-capacity.rb
-- check-elasticache-failover.rb
-- handler-ses.rb
-- check-subnet-ip-consumption.rb
-- check-trustedadvisor-service-limits.rb
-- check-ebs-burst-limit.rb
-- check-asg-instances-inservice.rb
-- check-alb-target-group-health.rb
-- check-autoscaling-cpucredits.rb
-- check-ses-limit.rb
-- check-asg-instances-created.rb
-- check-certificate-expiry.rb
-- check-sns-subscriptions.rb
-- check-ec2-filter.rb
-- metrics-s3.rb
-- metrics-ses.rb
-- check-ebs-snapshots.rb
 - check-rds-events.rb
-- check-ec2-network.rb
-- metrics-ec2-count.rb
-- metrics-autoscaling-instance-count.rb
-- metrics-billing.rb
-- check-cloudfront-tag.rb
-- check-instance-reachability.rb
-- check-emr-cluster.rb
+- check-rds-pending.rb
+- check-rds.rb
+- check-redshift-events.rb
+- check-reserved-instances.rb
+- check-route.rb
+- check-route53-domain-expiration.rb
+- check-s3-bucket.rb
+- check-s3-object.rb
+- check-s3-tag.rb
 - check-sensu-client.rb
+- check-ses-limit.rb
+- check-ses-statistics.rb
+- check-sns-subscriptions.rb
 - check-sqs-messages.rb
+- check-subnet-ip-consumption.rb
+- check-trustedadvisor-service-limits.rb
+- check-vpc-nameservers.rb
 - check-vpc-vpn.rb
-- metrics-elb.rb
-- check-elb-health-fog.rb
-- check-s3-bucket.rb
-- check-route.rb
 - handler-ec2_node.rb
-- check-instance-events.rb
-- check-elb-nodes.rb
-- check-ec2-cpu_balance.rb
-- metrics-emr-steps.rb
-- check-ecs-service-health.rb
-- check-redshift-events.rb
-- check-beanstalk-health.rb
 - handler-scale-asg-down.rb
+- handler-scale-asg-up.rb
+- handler-ses.rb
 - handler-sns.rb
+- metrics-asg.rb
+- metrics-autoscaling-instance-count.rb
+- metrics-billing.rb
+- metrics-ec2-count.rb
+- metrics-ec2-filter.rb
 - metrics-elasticache.rb
-- check-cloudwatch-alarm.rb
+- metrics-elb-full.rb
+- metrics-elb.rb
+- metrics-emr-steps.rb
+- metrics-rds.rb
+- metrics-s3.rb
+- metrics-ses.rb
+- metrics-sqs.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -445,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with an AWS environment