logstash-output-cloudwatch 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0b9071a81c5bbd5dbdeef941a120afdd4ef804
-  data.tar.gz: 17b23fa5e3201de3b87c03fab8d9605a1444510b
+  metadata.gz: e7873397a2d5b2b20af9ddc3883f5269cc9de9ad
+  data.tar.gz: 3a90d28b1d520e019431543297ae6e9e6e803296
 SHA512:
-  metadata.gz: 2ec9b6d78622a3c20f8e866b522523962577a313c4a80054c091f5f21da6a01b5d9ccf8feb20865a0b602074a80c3d8dbb773599c40c93039b6270d884233ec9
-  data.tar.gz: 956f463b22f557d908c83882455989ef670ff7a276eea04c29b24f056edbf7b5f1998e22686daffc43f32dc9ef22b470069884f4a89edb6baeb7c2252e82b1d3
+  metadata.gz: 7f3dcb9b4bb563e8d7b4c4b6859527fdf8163e8f33f047b7f5333f1621b10fcd2cf2c4beadca4c176783f7ef881a7254f3f7e964fa5b61105cefa5ca0f3bd21f
+  data.tar.gz: 3aaa9e1431f5b86628d3cac53a90604b77eb18dbd2f8d628d66653c40717adb74fcf51d48cac36b8f3a506f791f4c526d3969e89007bf973b59eef387748984d

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+

data/lib/logstash/outputs/cloudwatch.rb

@@ -52,7 +52,7 @@ require "logstash/plugin_mixins/aws_config"
 # by their metric name (either a default or from their `CW_metricname` field)
 #
 # Other fields which can be added to events to modify the behavior of this
-# plugin are, `CW_namespace`, `CW_unit`, `CW_value`, and 
+# plugin are, `CW_namespace`, `CW_unit`, `CW_value`, and
 # `CW_dimensions`.  All of these field names are configurable in
 # this output.  You can also set per-output defaults for any of them.
 # See below for details.
@@ -62,7 +62,7 @@ require "logstash/plugin_mixins/aws_config"
 # http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference/API_PutMetricData.html[PutMetricData]
 class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
   include LogStash::PluginMixins::AwsConfig
-  
+
   config_name "cloudwatch"
 
   # Constants
@@ -79,7 +79,7 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
   COUNT_UNIT = "Count"
   NONE = "None"
 
-  # How often to send data to CloudWatch   
+  # How often to send data to CloudWatch
   # This does not affect the event timestamps, events will always have their
   # actual timestamp (to-the-minute) sent to CloudWatch.
   #
@@ -88,27 +88,27 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
   # See the Rufus Scheduler docs for an https://github.com/jmettraux/rufus-scheduler#the-time-strings-understood-by-rufus-scheduler[explanation of allowed values]
   config :timeframe, :validate => :string, :default => "1m"
 
-  # How many events to queue before forcing a call to the CloudWatch API ahead of `timeframe` schedule   
+  # How many events to queue before forcing a call to the CloudWatch API ahead of `timeframe` schedule
   # Set this to the number of events-per-timeframe you will be sending to CloudWatch to avoid extra API calls
   config :queue_size, :validate => :number, :default => 10000
 
   # The default namespace to use for events which do not have a `CW_namespace` field
   config :namespace, :validate => :string, :default => "Logstash"
 
-  # The name of the field used to set a different namespace per event   
+  # The name of the field used to set a different namespace per event
   # Note: Only one namespace can be sent to CloudWatch per API call
   # so setting different namespaces will increase the number of API calls
   # and those cost money.
   config :field_namespace, :validate => :string, :default => "CW_namespace"
 
-  # The default metric name to use for events which do not have a `CW_metricname` field.   
+  # The default metric name to use for events which do not have a `CW_metricname` field.
   # Beware: If this is provided then all events which pass through this output will be aggregated and
   # sent to CloudWatch, so use this carefully.  Furthermore, when providing this option, you
   # will probably want to also restrict events from passing through this output using event
   # type, tag, and field matching
   config :metricname, :validate => :string
 
-  # The name of the field used to set the metric name on an event   
+  # The name of the field used to set the metric name on an event
   # The author of this plugin recommends adding this field to events in inputs &
   # filters rather than using the per-output default setting so that one output
   # plugin on your logstash indexer can serve all events (which of course had
@@ -123,26 +123,26 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
                  "Bits/Second", "Kilobits/Second", "Megabits/Second",
                  "Gigabits/Second", "Terabits/Second", "Count/Second", NONE]
 
-  # The default unit to use for events which do not have a `CW_unit` field   
+  # The default unit to use for events which do not have a `CW_unit` field
   # If you set this option you should probably set the "value" option along with it
   config :unit, :validate => VALID_UNITS, :default => COUNT_UNIT
 
-  # The name of the field used to set the unit on an event metric   
+  # The name of the field used to set the unit on an event metric
   config :field_unit, :validate => :string, :default => "CW_unit"
 
-  # The default value to use for events which do not have a `CW_value` field   
+  # The default value to use for events which do not have a `CW_value` field
   # If provided, this must be a string which can be converted to a float, for example...
   #     "1", "2.34", ".5", and "0.67"
   # If you set this option you should probably set the `unit` option along with it
   config :value, :validate => :string, :default => "1"
 
-  # The name of the field used to set the value (float) on an event metric   
+  # The name of the field used to set the value (float) on an event metric
   config :field_value, :validate => :string, :default => "CW_value"
 
-  # The default dimensions [ name, value, ... ] to use for events which do not have a `CW_dimensions` field   
+  # The default dimensions [ name, value, ... ] to use for events which do not have a `CW_dimensions` field
   config :dimensions, :validate => :hash
 
-  # The name of the field used to set the dimensions on an event metric   
+  # The name of the field used to set the dimensions on an event metric
   # The field named here, if present in an event, must have an array of
   # one or more key & value pairs, for example...
   #     `add_field => [ "CW_dimensions", "Environment", "CW_dimensions", "prod" ]`
@@ -157,7 +157,7 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
         :cloud_watch_endpoint => "monitoring.#{region}.amazonaws.com"
     }
   end
-  
+
   public
   def register
     require "thread"
@@ -176,13 +176,12 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
 
   public
   def receive(event)
-    return unless output?(event)
+    
 
     if event == LogStash::SHUTDOWN
       job.trigger()
       job.unschedule()
       @logger.info("CloudWatch aggregator thread shutdown.")
-      finished
       return
     end
 

data/logstash-output-cloudwatch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-cloudwatch'
-  s.version         = '2.0.0'
+  s.version         = '2.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output lets you aggregate and send metric data to 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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
   s.add_runtime_dependency 'logstash-mixin-aws'
   s.add_runtime_dependency 'rufus-scheduler', [ '~> 3.0.9' ]
   s.add_runtime_dependency 'aws-sdk'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: