logstash-input-cloudwatch 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e95131861e3d73ddd1d47e955321d0686248716
-  data.tar.gz: 361ec5a82fbe63eada201d138246e399656454ef
+  metadata.gz: 714fb9324b667cc5e6318beea884232eec399de7
+  data.tar.gz: eb9fcaced10b0ff797bdb956aef90f1d4f622538
 SHA512:
-  metadata.gz: 45715e6fa60d4a73fec3662cbd44a04a0f1105d72ec6726cf9fc4de5016a0ace20707a50009f0c30fce543260e87c3afbc43be8177addd2d6cde021990962a02
-  data.tar.gz: dc7b7f6cc21e2ba8965437d0d2a9f0e9c73777054a56dba51c594740c7676e31dca693b6960d7a827dd82082c46c5b208971d185db3a0d39380bae6360170de4
+  metadata.gz: b0979483d18a9c984d9705557ab534f8d0fc382aed2f5b6ccd83bf2884b84e3dc72bba7bc4f5f1188e08c5dfaa7727ee584c135132c9e9597ce6417adcf008b7
+  data.tar.gz: 37fd5c701c206fa282a547f07517b599e77f20584394243983893acfe8669aa12cf8ea3ac9ef82f68e39b7297e2e1e72ef63b419fe1409aebb726d061c9c5f82

data/lib/logstash/inputs/cloudwatch.rb

@@ -109,6 +109,9 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   # to ensure you're using valid filters.
   config :filters, :validate => :array
 
+  # Use this for namespaces that need to combine the dimensions like S3 and SNS.
+  config :combined, :validate => :boolean, :default => false
+
   public
   def aws_service_endpoint(region)
     { region: region }
@@ -119,8 +122,10 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
     require "aws-sdk"
     AWS.config(:logger => @logger)
 
-    # Initialize all the clients
-    [@namespace, 'CloudWatch'].each { |ns| clients[ns] }
+    raise 'Unsupported namespace ' + @namespace unless @namespace[0..3] == 'AWS/'
+    raise 'Interval needs to be higher than period' unless @interval >= @period
+    raise 'Interval must be divisible by peruid' unless @interval % @period == 0
+
     @last_check = Time.now
   end # def register
 
@@ -133,21 +138,45 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
       # For every metric
       metrics_for(@namespace).each do |metric|
         @logger.info "Polling metric #{metric}"
-        # For every dimension in the metric
-        resources.each_pair do |dimension, dim_resources|
-          # For every resource in the dimension
-          dim_resources = *dim_resources
-          dim_resources.each do |resource|
-            # For every event in the resource
-            fetch_resource_events(dimension, resource, metric_options(@namespace, metric)).each do |event|
-              queue << event
-            end
-          end
-        end
+        @logger.info "Filters: #{aws_filters}"
+        @combined ? from_filters(queue, metric) : from_resources(queue, metric)
       end
     end # loop
   end # def run
 
+  def from_resources(queue, metric)
+    # For every dimension in the metric
+    resources.each_pair do |dimension, dim_resources|
+      # For every resource in the dimension
+      dim_resources = *dim_resources
+      dim_resources.each do |resource|
+        # For every event in the resource
+        fetch_resource_events(dimension, resource, metric_options(@namespace, metric)).each do |event|
+          queue << event
+        end
+      end
+    end
+  end
+
+  private
+  def from_filters(queue, metric)
+    options = metric_options(@namespace, metric)
+    options[:dimensions] = aws_filters
+    @logger.info "Dim: #{options[:dimensions]}"
+    datapoints = clients['CloudWatch'].get_metric_statistics(options)
+    @logger.debug "DPs: #{datapoints.data}"
+    datapoints[:datapoints].each do |event|
+      event.merge! options
+      aws_filters.each do |dimension|
+        event[dimension[:name].to_sym] = dimension[:value]
+      end
+      event = LogStash::Event.new(cleanup(event))
+      decorate(event)
+      queue << event
+    end
+  end
+
+  private
   def fetch_resource_events(dimension, resource, options)
     @logger.info "Polling resource #{dimension}: #{resource}"
     options[:dimensions] = [ { name: dimension, value: resource } ]
@@ -161,6 +190,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
     end
   end
 
+  private
   def cleanup(event)
     event.delete :statistics
     event.delete :dimensions
@@ -213,15 +243,18 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   private
   def aws_filters
     @filters.collect do |key, value|
-      value = [value] unless value.is_a? Array
-      { name: key, values: value }
+      if ['AWS/EC2', 'AWS/EBS'].include?(@namespace)
+        value = [value] unless value.is_a? Array
+        { name: key, values: value }
+      else
+        { name: key, value: value }
+      end
     end
   end
 
   private
   def resources
     # See http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html
-    @logger.info "Filters: #{aws_filters}"
     case @namespace
     when 'AWS/EC2'
       instances = clients[@namespace].describe_instances(filters: aws_filters)[:reservation_set].collect do |r|
@@ -235,7 +268,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
       end.flatten
       @logger.debug "AWS/EBS Volumes: #{volumes}"
       { 'VolumeId' => volumes }
-    when 'AWS/RDS'
+    else
       @filters
     end
   end

data/logstash-input-cloudwatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-cloudwatch'
-  s.version = '1.0.1'
+  s.version = '1.0.3'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Retrieve stats from AWS CloudWatch."
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,98 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Jurgens du Toit
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-codec-plain
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: stud
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.19
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.19
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-mixin-aws
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.16
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.16
-  prerelease: false
-  type: :development
-description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
+description: This gem is a logstash plugin required to be installed on top of the
+  Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not
+  a stand-alone program
 email: jrgns@eagerelk.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - DEVELOPER.md
 - Gemfile
@@ -108,24 +110,24 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
 specification_version: 4
 summary: Retrieve stats from AWS CloudWatch.
 test_files: