logstash-filter-jdbc 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd156b8cd6dbdd977575f47331cddd69a8c85e5
-  data.tar.gz: 1bc4f90f12e3c4cb2a0f3bd40ece7abad49fbf1c
+  metadata.gz: 54ba30f7e632aeed7b0b7042128056461f10c297
+  data.tar.gz: 760cd41b821c9bf894593c1eea41ea3e45bbb890
 SHA512:
-  metadata.gz: 61554b48417126c424bff92340575f16f67fd06b3284fd4b434e8694d577ac5050d43bc626c303d6c2ba5513f8949c5367de21a2ea269f0ab40c5248ab7b9ac1
-  data.tar.gz: d7d314c6012188fe20f386164781e32ac977826c09f903c62f1b7e74cb771479bb9ea9ff9e9d5b8b428bb9487e3b5cc949bbda6fcd11239c235cab714c0bf90b
+  metadata.gz: bdf0718a4ee0784a262cedd9260e33f6bb563edeed4d8a0ff5f23e0ddb4e585209a86dec59c2d7f29b559b24074abbb47369319fed209cb42bc258e4f129de39
+  data.tar.gz: e51d4bdd3eedeadf3b7f182ab8727a628a7e04dede0e43049c7b2b34381356a089843869ea5e7460864a7674ed5670f430b3faf96df0e3671198ebd5fd3efb9f

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 1.0.0
+ - New dependency requirements for the 5.0 release
+
+## 0.1.2
+ - Initial releast

data/lib/logstash/filters/jdbc.rb

@@ -43,6 +43,7 @@ class LogStash::Filters::Jdbc < LogStash::Filters::Base
 
   public
   def register
+    @logger = self.logger
     prepare_jdbc_connection()
   end # def register
 
@@ -50,18 +51,17 @@ class LogStash::Filters::Jdbc < LogStash::Filters::Base
   def filter(event)
     result = []
     #Prepare parameters from event values
-    params = @parameters.inject({}) {|hash,(k,v)| hash[k] = event[event.sprintf(v)] ; hash }
+    params = @parameters.inject({}) {|hash,(k,v)| hash[k] = event.get(event.sprintf(v)) ; hash }
     #Execute statement and collect results
     success = execute_statement(@statement,params) do |row|
       result << row
     end
     if success
-      event[@target] = result
+      event.set(@target, result)
       filter_matched(event)
     else
       @tag_on_failure.each do |tag|
-        event["tags"] ||= []
-        event["tags"] << tag unless event["tags"].include?(tag)
+        event.tag(tag)
       end
     end
   end # def filter

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -5,8 +5,6 @@ require "logstash/config/mixin"
 # for potential reuse in other plugins (input/output)
 module LogStash::PluginMixins::Jdbc
 
-  @logger = Cabin::Channel.get(LogStash)
-
   # This method is called when someone includes this module
   def self.included(base)
     # Add these methods to the 'base' given.

data/logstash-filter-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-jdbc'
-  s.version         = '0.1.2'
+  s.version         = '1.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This filter executes a SQL query and store the result set in the event."
   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"
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 2.0.0.beta2', '< 5.0.0'
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'sequel'
-  
+
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'jdbc-derby'
 end

data/spec/filters/jdbc_spec.rb

@@ -19,7 +19,7 @@ describe LogStash::Filters::Jdbc do
     end
 
     sample("message" => "some text") do
-      expect(subject['new_field']).to eq([{"1" => 'from_database'}])
+      expect(subject.get('new_field')).to eq([{"1" => 'from_database'}])
     end
   end
 
@@ -37,7 +37,7 @@ describe LogStash::Filters::Jdbc do
     end
 
     sample("message" => "some text") do
-      expect(subject['new_field']).to eq([{"col_1" => 'from_database'}])
+      expect(subject.get('new_field')).to eq([{"col_1" => 'from_database'}])
     end
   end
 
@@ -56,11 +56,11 @@ describe LogStash::Filters::Jdbc do
     end
 
     sample("message" => "some text", "param_field" => "1") do
-      expect(subject['new_field']).to eq([{"1" => 'from_database'}])
+      expect(subject.get('new_field')).to eq([{"1" => 'from_database'}])
     end
 
     sample("message" => "some text", "param_field" => "2") do
-      expect(subject['new_field'].nil?)
+      expect(subject.get('new_field').nil?)
     end
   end
 
@@ -79,11 +79,11 @@ describe LogStash::Filters::Jdbc do
     end
 
     sample("message" => "some text", "param_field" => 1) do
-      expect(subject['new_field']).to eq([{"1" => 'from_database'}])
+      expect(subject.get('new_field')).to eq([{"1" => 'from_database'}])
     end
 
     sample("message" => "some text", "param_field" => "1") do
-      expect(subject['new_field'].nil?)
+      expect(subject.get('new_field').nil?)
     end
   end
 
@@ -102,7 +102,7 @@ describe LogStash::Filters::Jdbc do
     end
 
     sample("message" => "some text") do
-      expect(subject['new_field']).to eq([{"1" => 'from_database'}])
+      expect(subject.get('new_field')).to eq([{"1" => 'from_database'}])
     end
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
+        version: '1.60'
+    - - <=
       - !ruby/object:Gem::Version
-        version: 5.0.0
-  name: logstash-core
+        version: '2.99'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
+        version: '1.60'
+    - - <=
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -78,6 +78,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - DEVELOPMENT.md
 - Gemfile
 - LICENSE