sensu-plugins-aws 0.0.4 → 1.0.0

data/bin/{autoscaling-instance-count-metrics.rb → metrics-autoscaling-instance-count.rb}

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 #
-# autoscaling-instance-count-metrics
+# metrics-autoscaling-instance-count
 #
 # DESCRIPTION:
 #   Get a count of instances in a given AutoScaling group
@@ -12,10 +12,11 @@
 #   Linux
 #
 # DEPENDENCIES:
-#   gem: aws-sdk
+#   gem: aws-sdk-v1
 #   gem: sensu-plugin
 #
 # USAGE:
+#   #YELLOW
 #
 # NOTES:
 #
@@ -44,27 +45,26 @@ class AutoScalingInstanceCountMetrics < Sensu::Plugin::Metric::CLI::Graphite
   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_ID'] or provide it as an option",
+         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_ACCESS_KEY',
-         long: '--aws-secret-access-key AWS_SECRET_ACCESS_KEY',
-         description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_ACCESS_KEY'] or provide it as an option",
+         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 (such as eu-west-1).',
+         description: 'AWS Region (defaults to us-east-1).',
          default: 'us-east-1'
 
   def aws_config
-    hash = {}
-    hash.update aws_access_key_id: config[:aws_access_key], aws_secret_access_key: config[:aws_secret_access_key]\
-      if config[:aws_access_key] && config[:aws_secret_access_key]
-    hash.update region: config[:aws_region]
-    hash
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
   end
 
   def run

data/bin/metrics-ec2-count.rb

@@ -3,7 +3,7 @@
 # ec2-count-metrics
 #
 # DESCRIPTION:
-#   This plugin retrives number of EC2 status
+#   This plugin retrieves number of EC2 instances
 #
 # OUTPUT:
 #   plain-text
@@ -12,7 +12,7 @@
 #   Linux
 #
 # DEPENDENCIES:
-#   gem: aws-sdk
+#   gem: aws-sdk-v1
 #   gem: sensu-plugin
 #
 # USAGE:
@@ -39,17 +39,19 @@ class EC2Metrics < Sensu::Plugin::Metric::CLI::Graphite
   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_ID'] or provide it as an option"
+         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_ACCESS_KEY',
-         long: '--aws-secret-access-key AWS_SECRET_ACCESS_KEY',
-         description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_ACCESS_KEY'] or provide it as an option"
+         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 (such as us-east-1).',
+         description: 'AWS Region (defaults to us-east-1).',
          default: 'us-east-1'
 
   option :type,
@@ -59,74 +61,74 @@ class EC2Metrics < Sensu::Plugin::Metric::CLI::Graphite
          default: 'instance'
 
   def aws_config
-    hash = {}
-    hash.update access_key_id: config[:access_key_id], secret_access_key: config[:secret_access_key] if config[:access_key_id] && config[:secret_access_key]
-    hash.update region: config[:aws_region]
-    hash
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
   end
 
-  def run
-    begin
+  def by_instances_status(client)
+    if config[:scheme] == 'sensu.aws.ec2'
+      config[:scheme] += '.count'
+    end
 
-      client = AWS::EC2::Client.new aws_config
+    options = { include_all_instances: true }
+    data = client.describe_instance_status(options)
 
-      def by_instances_status(client)
-        if config[:scheme] == 'sensu.aws.ec2'
-          config[:scheme] += '.count'
-        end
+    total = data[:instance_status_set].count
+    status = {}
 
-        options = { include_all_instances: true }
-        data = client.describe_instance_status(options)
-
-        total = data[:instance_status_set].count
-        status = {}
-
-        unless total.nil?
-          data[:instance_status_set].each do |value|
-            stat = value[:instance_state][:name]
-            if status[stat].nil?
-              status[stat] = 1
-            else
-              status[stat] = status[stat] + 1
-            end
-          end
+    unless total.nil?
+      data[:instance_status_set].each do |value|
+        stat = value[:instance_state][:name]
+        if status[stat].nil?
+          status[stat] = 1
+        else
+          status[stat] = status[stat] + 1
         end
+      end
+    end
 
-        unless data.nil? # rubocop: disable Style/GuardClause
-          # We only return data when we have some to return
-          output config[:scheme] + '.total', total
-          status.each do |name, count|
-            output config[:scheme] + ".#{name}", count
-          end
-        end
+    unless data.nil? # rubocop: disable Style/GuardClause
+      # We only return data when we have some to return
+      output config[:scheme] + '.total', total
+      status.each do |name, count|
+        output config[:scheme] + ".#{name}", count
       end
+    end
+  end
 
-      def by_instances_type(client)
-        if config[:scheme] == 'sensu.aws.ec2'
-          config[:scheme] += '.types'
-        end
+  def by_instances_type(client)
+    if config[:scheme] == 'sensu.aws.ec2'
+      config[:scheme] += '.types'
+    end
 
-        data = {}
-
-        instances = client.describe_instances
-        instances[:reservation_set].each do |i|
-          i[:instances_set].each do |instance|
-            type = instance[:instance_type]
-            if data[type].nil?
-              data[type] = 1
-            else
-              data[type] = data[type] + 1
-            end
-          end
-        end
+    data = {}
 
-        unless data.nil? # rubocop: disable Style/GuardClause
-          # We only return data when we have some to return
-          data.each do |name, count|
-            output config[:scheme] + ".#{name}", count
-          end
+    instances = client.describe_instances
+    instances[:reservation_set].each do |i|
+      i[:instances_set].each do |instance|
+        type = instance[:instance_type]
+        if data[type].nil?
+          data[type] = 1
+        else
+          data[type] = data[type] + 1
         end
       end
+    end
+
+    unless data.nil? # rubocop: disable Style/GuardClause
+      # We only return data when we have some to return
+      data.each do |name, count|
+        output config[:scheme] + ".#{name}", count
+      end
+    end
+  end
+
+  def run
+    begin
+
+      client = AWS::EC2::Client.new aws_config
 
       if config[:type] == 'instance'
         by_instances_type(client)

data/bin/metrics-elasticache.rb

@@ -12,13 +12,12 @@
 #   Linux
 #
 # DEPENDENCIES:
-#   gem: aws-sdk
+#   gem: aws-sdk-v1
 #   gem: sensu-plugin
 #
-# needs example command
 # USAGE:
 #   #YELLOW
-
+#
 # NOTES:
 #   Redis: http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CacheMetrics.Redis.html
 #   Memcached: http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CacheMetrics.Memcached.html
@@ -69,24 +68,26 @@ class ElastiCacheMetrics < Sensu::Plugin::Metric::CLI::Graphite
   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_ID'] or provide it as an option"
+         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_ACCESS_KEY',
-         long: '--aws-secret-access-key AWS_SECRET_ACCESS_KEY',
-         description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_ACCESS_KEY'] or provide it as an option"
+         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 (such as us-east-1).',
+         description: 'AWS Region (defaults to us-east-1).',
          default: 'us-east-1'
 
   def aws_config
-    hash = {}
-    hash.update access_key_id: config[:access_key_id], secret_access_key: config[:secret_access_key] if config[:access_key_id] && config[:secret_access_key]
-    hash.update region: config[:aws_region]
-    hash
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
   end
 
   def run

data/bin/metrics-elb-full.rb

@@ -12,6 +12,7 @@
 #   Linux
 #
 # DEPENDENCIES:
+#   gem: aws-sdk-v1
 #   gem: sensu-plugin
 #
 # USAGE:
@@ -37,9 +38,10 @@ require 'aws-sdk-v1'
 
 class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :elbname,
-         description: 'Name of the Elastic Load Balancer',
+         description: 'Name of the Elastic Load Balancer (separate with commas for multiple ELBs)',
          short: '-n ELB_NAME',
-         long: '--name ELB_NAME'
+         long: '--name ELB_NAME',
+         required: true
 
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
@@ -58,27 +60,25 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
          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",
-         required: true,
          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",
-         required: true,
          default: ENV['AWS_SECRET_KEY']
 
   option :aws_region,
          short: '-r AWS_REGION',
          long: '--aws-region REGION',
-         description: 'AWS Region (such as eu-west-1).',
+         description: 'AWS Region (defaults to us-east-1).',
          default: 'us-east-1'
 
   def aws_config
-    hash = {}
-    hash.update access_key_id: config[:access_key_id], secret_access_key: config[:secret_access_key] if config[:access_key_id] && config[:secret_access_key]
-    hash.update region: config[:aws_region]
-    hash
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
   end
 
   def run
@@ -109,7 +109,7 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
         'dimensions' => [
           {
             'name' => 'LoadBalancerName',
-            'value' => config[:elbname]
+            'value' => nil
           }
         ],
         'start_time' => st.iso8601,
@@ -118,13 +118,15 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
       }
 
       result = {}
-      graphitepath = config[:scheme]
 
-      config[:elbname].split(' ').each do |elbname|
+      config[:elbname].split(',').each do |elbname|
+        if config[:scheme] == ''
+          graphitepath = "#{elbname}"
+        else
+          graphitepath = "#{config[:scheme]}.#{elbname}"
+        end
+
         statistic_type.each do |key, value|
-          if config[:scheme] == ''
-            graphitepath = "#{config[:elbname]}.#{key.downcase}"
-          end
           options['metric_name'] = key
           options['dimensions'][0]['value'] = elbname
           options['statistics'] = [value]

data/bin/metrics-elb.rb

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 #
-# elb-latency-metrics
+# elb-metrics
 #
 # DESCRIPTION:
 #   Gets latency metrics from CloudWatch and puts them in Graphite for longer term storage
@@ -12,6 +12,7 @@
 #   Linux
 #
 # DEPENDENCIES:
+#   gem: aws-sdk-v1
 #   gem: sensu-plugin
 #
 # USAGE:
@@ -39,7 +40,8 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :elbname,
          description: 'Name of the Elastic Load Balancer',
          short: '-n ELB_NAME',
-         long: '--name ELB_NAME'
+         long: '--name ELB_NAME',
+         required: true
 
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
@@ -81,18 +83,17 @@ class ELBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :aws_region,
          short: '-r AWS_REGION',
          long: '--aws-region REGION',
-         description: 'AWS Region (such as eu-west-1).',
+         description: 'AWS Region (defaults to us-east-1).',
          default: 'us-east-1'
 
   def aws_config
-    hash = {}
-    hash.update access_key_id: config[:access_key_id], secret_access_key: config[:secret_access_key] if config[:access_key_id] && config[:secret_access_key]
-    hash.update region: config[:aws_region]
-    hash
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
   end
 
   def run
-    statistic = ''
     if config[:statistic] == ''
       default_statistic_per_metric = {
         'Latency' => 'Average',

data/bin/metrics-sqs.rb

@@ -12,7 +12,7 @@
 #   Linux
 #
 # DEPENDENCIES:
-#   gem: aws-sdk
+#   gem: aws-sdk-v1
 #   gem: sensu-plugin
 #
 # USAGE:
@@ -43,21 +43,30 @@ class SQSMetrics < Sensu::Plugin::Metric::CLI::Graphite
          default: ''
 
   option :aws_access_key,
-         description: "AWS Access Key. Either set ENV['AWS_ACCESS_KEY_ID'] or provide it as an option",
+         description: "AWS Access Key. Either set ENV['AWS_ACCESS_KEY'] or provide it as an option",
          short: '-a AWS_ACCESS_KEY',
-         long: '--aws-access-key AWS_ACCESS_KEY'
+         long: '--aws-access-key AWS_ACCESS_KEY',
+         default: ENV['AWS_ACCESS_KEY']
 
   option :aws_secret_access_key,
          description: "AWS Secret Access Key. Either set ENV['AWS_SECRET_ACCESS_KEY'] or provide it as an option",
-         short: '-k AWS_SECRET_ACCESS_KEY',
-         long: '--aws-secret-access-key AWS_SECRET_ACCESS_KEY'
+         short: '-k AWS_SECRET_KEY',
+         long: '--aws-secret-access-key AWS_SECRET_KEY',
+         default: ENV['AWS_SECRET_KEY']
 
   option :aws_region,
-         description: 'AWS Region (such as us-east-1)',
+         description: 'AWS Region (defaults to us-east-1).',
          short: '-r AWS_REGION',
          long: '--aws-region AWS_REGION',
          default: 'us-east-1'
 
+  def aws_config
+    { access_key_id: config[:aws_access_key],
+      secret_access_key: config[:aws_secret_access_key],
+      region: config[:aws_region]
+    }
+  end
+
   def run
     if config[:scheme] == ''
       scheme = "aws.sqs.queue.#{config[:queue].gsub('-', '_')}.message_count"
@@ -66,11 +75,7 @@ class SQSMetrics < Sensu::Plugin::Metric::CLI::Graphite
     end
 
     begin
-      sqs = AWS::SQS.new(
-        access_key_id: config[:aws_access_key],
-        secret_access_key: config[:aws_secret_access_key],
-        region: config[:aws_region]
-      )
+      sqs = AWS::SQS.new aws_config
 
       messages = sqs.queues.named(config[:queue]).approximate_number_of_messages
       output scheme, messages