logstash-filter-aggregate 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847b68e7346466cf927e4975469593a48ebb9771
-  data.tar.gz: 9b0dd0eb302cfba006c09970a2442ccf5d316fa9
+  metadata.gz: adf79052e26c1e6eeabb0088a906057312030eb3
+  data.tar.gz: ee5b2fd034f84cbd2f047bd225b0d7eaec326269
 SHA512:
-  metadata.gz: d8d934c2ba456f1d828bf97e7cee1c5027d424e08340d6fd1be63944558c03daec0cf387b33621b4cb769dda443adb1e1693a7cf3e14b41990bd4d5b87673a34
-  data.tar.gz: 6cdf6281964d83d2c64dc19eb764b9d15e50fdfd9fc50d29e1d7d0af10edb67f7757eef66bb2bc70dbe856dda67ee9d9c1f4908de4b33adc85411b44356e2c6e
+  metadata.gz: 9681cea6e04bad9b87c355480a42a09570f1d335f90cab5e3d92a39d783e2a14387414180f2561f17efeb300ac83cc8836d78426607dea64565790094a8df1f8
+  data.tar.gz: bbee958fccf8e6973b666941b7d035744d4416973d290bfb2e7d4d439b785643902d1199b6f18acee82874a1e2ccd9bfd0e0a0034eb2268512d9871c2478ff7e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.1
+ - bugfix: when "aggregate_maps_path" option is defined in more than one aggregate filter, raise a Logstash::ConfigurationError 
+ - bugfix: add support for logstash hot reload feature 
+
 ## 2.1.0
  - new feature: add new option "aggregate_maps_path" so that aggregate maps can be stored at logstash shutdown and reloaded at logstash startup
 

data/README.md

@@ -153,10 +153,15 @@ The default value is 0, which means no timeout so no auto eviction.
 - **aggregate_maps_path:**  
 The path to file where aggregate maps are stored when logstash stops and are loaded from when logstash starts.  
 If not defined, aggregate maps will not be stored at logstash stop and will be lost.   
-Should be defined for only one aggregate filter (as aggregate maps are global).  
+Must be defined in only one aggregate filter (as aggregate maps are global).  
 Example value : `"/path/to/.aggregate_maps"`
 
 
+## Changelog
+
+Read [CHANGELOG.md](CHANGELOG.md).
+
+
 ## Need Help?
 
 Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.

data/lib/logstash/filters/aggregate.rb

@@ -173,7 +173,7 @@ class LogStash::Filters::Aggregate < LogStash::Filters::Base
   # and are loaded from when logstash starts.
   #
   # If not defined, aggregate maps will not be stored at logstash stop and will be lost. 
-  # Should be defined for only one aggregate filter (as aggregate maps are global).
+  # Must be defined in only one aggregate filter (as aggregate maps are global).
   #
   # Example value : `"/path/to/.aggregate_maps"`
   config :aggregate_maps_path, :validate => :string, :required => false
@@ -195,6 +195,10 @@ class LogStash::Filters::Aggregate < LogStash::Filters::Base
   # last time where eviction was launched
   @@last_eviction_timestamp = nil
 
+  # flag indicating if aggregate_maps_path option has been already set on one aggregate instance
+  @@aggregate_maps_path_set = false
+
+  
   # Initialize plugin
   public
   def register
@@ -207,6 +211,16 @@ class LogStash::Filters::Aggregate < LogStash::Filters::Base
         @@eviction_instance = self
         @logger.info("Aggregate, timeout: #{@timeout} seconds")
       end
+
+      # check if aggregate_maps_path option has already been set on another instance
+      if (!@aggregate_maps_path.nil?)
+        if (@@aggregate_maps_path_set)
+          @@aggregate_maps_path_set = false
+          raise LogStash::ConfigurationError, "Option 'aggregate_maps_path' must be set on only one aggregate filter"
+        else
+          @@aggregate_maps_path_set = true
+        end
+      end
       
       # load aggregate maps from file (if option defined)
       if (!@aggregate_maps_path.nil? && File.exist?(@aggregate_maps_path))
@@ -220,6 +234,11 @@ class LogStash::Filters::Aggregate < LogStash::Filters::Base
   # Called when logstash stops
   public
   def close
+
+    # Protection against logstash reload
+    @@aggregate_maps_path_set = false if @@aggregate_maps_path_set
+    @@eviction_instance = nil unless @@eviction_instance.nil?
+
     @@mutex.synchronize do
       # store aggregate maps to file (if option defined)
       if (!@aggregate_maps_path.nil? && !@@aggregate_maps.empty?)

data/logstash-filter-aggregate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-aggregate'
-  s.version         = '2.1.0'
+  s.version         = '2.1.1'
   s.licenses = ['Apache License (2.0)']
   s.summary = "The aim of this filter is to aggregate information available among several events (typically log lines) belonging to a same task, and finally push aggregated information into final task event."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/filters/aggregate_spec.rb

@@ -206,5 +206,16 @@ describe LogStash::Filters::Aggregate do
         
       end
     end
+
+    describe "when aggregate_maps_path option is defined in 2 instances, " do
+      it "raises Logstash::ConfigurationError" do
+
+        expect {
+          setup_filter({ "code" => "", "aggregate_maps_path" => "aggregate_maps1" })
+          setup_filter({ "code" => "", "aggregate_maps_path" => "aggregate_maps2" })
+        }.to raise_error(LogStash::ConfigurationError)
+        
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-aggregate
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Elastic
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement