logstash-input-cloudwatch 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12e012615fab932116207a718a61617805b92754
-  data.tar.gz: 17d3562c62835108f5052ed4b4d2c7a88c6ba9a0
+  metadata.gz: c9c5921cbe00bcdaaa089a9f97d88863869be245
+  data.tar.gz: bb4bd43089b72c11db43c161078fdb8db65c8e5b
 SHA512:
-  metadata.gz: b10649bfa6339894d72ce77bec5284cc03e98fe0a628381e5a5c1b3a456c20041498fd8abd4fa94e29b96d78b2507754b261694b981eae008c2d10df023dc05a
-  data.tar.gz: 3de28fb2df9dbbc4fb196fdec9a50b9e95d58fcab03bc94faf15b913acfcee92f36fb0dc71313a9b866fcc8f999f9e8ad1c8fb42f382623fc228c9fbbb89f784
+  metadata.gz: 796ce12c39087a592b8da474e8efa57fca67ebfe30a5c8f95e801feb73e3a3e13e8b6059c27bcbfbb9fa484609ea2351edd84c733d4f40a9c0dddc542f83bc14
+  data.tar.gz: 6c29d8cabbc1c6f9ad0f6df5ed68d84ec02926cad2a794c05551e1a39527aa4786dbee4fdb61edd4d9cc87b2732b75ae567cfc613ba28084cc803116d8c5cb5f

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# 1.1.3
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+# 1.1.1
+  - New dependency requirements for logstash-core for the 5.0 release
+## 1.1.0
+ - Moved from jrgns/logstash-input-cloudwatch to logstash-plugins

data/lib/logstash/inputs/cloudwatch.rb

@@ -108,7 +108,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   # Volumes: { 'attachment.status' => 'attached' }
   # Each namespace uniquely support certian dimensions. Please consult the documentation
   # to ensure you're using valid filters.
-  config :filters, :validate => :array
+  config :filters, :validate => :array, :required => true
 
   # Use this for namespaces that need to combine the dimensions like S3 and SNS.
   config :combined, :validate => :boolean, :default => false
@@ -143,14 +143,24 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
     end # loop
   end # def run
 
+  private
   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|
+        @logger.info "Polling resource #{dimension}: #{resource}"
+        options = metric_options(@namespace, metric)
+        options[:dimensions] = [ { name: dimension, value: resource } ]
+        datapoints = clients['CloudWatch'].get_metric_statistics(options)
+        @logger.debug "DPs: #{datapoints.data}"
         # For every event in the resource
-        fetch_resource_events(dimension, resource, metric_options(@namespace, metric)).each do |event|
+        datapoints[:datapoints].each do |event|
+          event.merge! options
+          event[dimension.to_sym] = resource
+          event = LogStash::Event.new(cleanup(event))
+          decorate(event)
           queue << event
         end
       end
@@ -175,20 +185,6 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
     end
   end
 
-  private
-  def fetch_resource_events(dimension, resource, options)
-    @logger.info "Polling resource #{dimension}: #{resource}"
-    options[:dimensions] = [ { name: dimension, value: resource } ]
-    datapoints = clients['CloudWatch'].get_metric_statistics(options)
-    @logger.debug "DPs: #{datapoints.data}"
-    datapoints[:datapoints].each do |event|
-      event.merge! options
-      event[dimension.to_sym] = resource
-      event = LogStash::Event.new(cleanup(event))
-      decorate(event)
-    end
-  end
-
   private
   def cleanup(event)
     event.delete :statistics

data/logstash-input-cloudwatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-cloudwatch'
-  s.version = '1.1.0'
+  s.version         = '1.1.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"
@@ -10,7 +10,17 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  s.files = Dir[
+    'lib/**/*',
+    'spec/**/*',
+    'vendor/**/*',
+    '*.gemspec',
+    '*.md',
+    'CONTRIBUTORS',
+    'Gemfile',
+    'LICENSE',
+    'NOTICE.TXT'
+  ]
    # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
@@ -18,7 +28,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 3.0.0'
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'stud', '>= 0.0.19'
   s.add_runtime_dependency 'logstash-mixin-aws'

metadata

@@ -1,104 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Jurgens du Toit
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
-  prerelease: false
+        version: '1.0'
   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
+        version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.19
-  name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.19
 - !ruby/object:Gem::Dependency
+  name: logstash-mixin-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-mixin-aws
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.16
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.16
-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
 - CHANGELOG.md
 - DEVELOPER.md
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/logstash/inputs/cloudwatch.rb
 - logstash-input-cloudwatch.gemspec
 - spec/inputs/cloudwatch_spec.rb
@@ -108,24 +102,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.2.2
+signing_key: 
 specification_version: 4
 summary: Retrieve stats from AWS CloudWatch.
 test_files:

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-Gemfile.lock
-Gemfile.bak
-.bundle
-vendor

data/Rakefile

@@ -1 +0,0 @@
-require "logstash/devutils/rake"