logstash-filter-useragent 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddffeef64ae000e5b97809024ad24998c26332a6
-  data.tar.gz: fd389b27d85ce52bbae79719adfbcab77227d148
+  metadata.gz: e4c6b3521d7a68e56571955f9a465863f25f0596
+  data.tar.gz: 156e6d0cf1f7696320df510e874deb54888b7df7
 SHA512:
-  metadata.gz: 93146ffee40b0608fd60e4e22cee78211537d6a3ee449f4d558ef0a21343119d73b788f49dba86dc58c4bb8e3f87934f146774cb53b8ecffba901a1a2f07455e
-  data.tar.gz: 5bbf9f638160972f0eff16b50fd0e0063277381f1f58e75e0e7be390dbeeb3f764b92067f4bb7cccc2a99cd83a6c7abc08390ae25d731438d3288e744040c6a0
+  metadata.gz: 3e08330cbeb238a629e27b4eb2e818a12016cce46a8c12f753b26aa15a875678fd6d4f7665b749fd2003e775bb881649a936312a007b4aeb1b0c07bfceeadde5
+  data.tar.gz: 77be20477df6051ef236c225e9d278a4c436a34f71cb771c09aede78d53f8b1d6c87a5c6c8e1a706aa22d0027109d73c6b093475a22d8450b00a4430d70e4513

data/CHANGELOG.md

@@ -1,2 +1,9 @@
+## 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
+
+* 2.0.1
+  - Add ability to replace source with target
 * 1.1.0
-  - Add LRU cache 
+  - Add LRU cache 

data/lib/logstash/filters/useragent.rb

@@ -78,7 +78,7 @@ class LogStash::Filters::UserAgent < LogStash::Filters::Base
 
   public
   def filter(event)
-    return unless filter?(event)
+    
 
     useragent = event[@source]
     useragent = useragent.first if useragent.is_a? Array
@@ -92,7 +92,14 @@ class LogStash::Filters::UserAgent < LogStash::Filters::Base
 
     return unless ua_data
 
-    target = @target.nil? ? event : (event[@target] ||= {})
+    if @target.nil?
+      target = event
+    elsif @target == @source
+      target = event[@source] = {}
+    else
+      target = event[@target] ||= {}
+    end
+
     write_to_target(target, ua_data)
 
     filter_matched(event)

data/logstash-filter-useragent.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-useragent'
-  s.version         = '2.0.0'
+  s.version         = '2.0.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Parse user agent strings into structured data based on BrowserScope data"
   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" => "filter" }
 
   # 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 'user_agent_parser', ['>= 2.0.0']
   s.add_runtime_dependency 'lru_redux', "~> 1.1.0"

data/spec/filters/useragent_spec.rb

@@ -87,4 +87,23 @@ describe LogStash::Filters::UserAgent do
       end
     end
   end
+
+  describe "Replace source with target" do
+    config <<-CONFIG
+      filter {
+        useragent {
+          source => "message"
+          target => "message"
+        }
+      }
+    CONFIG
+
+    sample "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.63 Safari/537.31" do
+      insist { subject }.include?("message")
+      insist { subject["message"]["name"] } == "Chrome"
+      insist { subject["message"]["os"] } == "Linux"
+      insist { subject["message"]["major"] } == "26"
+      insist { subject["message"]["minor"] } == "0"
+    end
+  end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-useragent
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 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: