logstash-output-cassandra 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb924301f2fb18274dadf7937c5fb10ddab91a80
-  data.tar.gz: d05bf1803112c866ffdc2ac13d5a7f4116709f31
+  metadata.gz: c9302d3a9e13a5a2d80d1b228d9741785599bffc
+  data.tar.gz: 9c35b7e36936512df5ab046c49a42152deacb522
 SHA512:
-  metadata.gz: ad63bb3d2685b22ec636c0af391689b4353231f448b2806bb05c2617dfa2cfcc391772ba7d1b23c921eccaad1281c63f7ccd080ba3d8463299d14df9f01a029d
-  data.tar.gz: 1dcda642fb5e9ab2f26930810ecc8ef99253a0cea977fb242823892a50e38fcd1025f17dc6a6ef42a44d6d0505c663d3293271e6e57a41d8846b865f52de0cad
+  metadata.gz: 0a6fd4c289c65ada58ff2939e6d1eb722a7e05afb0e0ab9ccaa495ac15de453c544cecb63209e4e2bdcbd5760d6ceba6af80e5c4f01b58b61a61bfd865ea188e
+  data.tar.gz: 64d572b84c1b1370dbb4c7cad7af6383f61d934d477c76041463d87d8aa622abff183efd121c0973c50b3a3d5029bd5d8c74d3b5ed8df2f88607f2e28d097f2f

data/LICENSE

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-Copyright (c) 2012-2015 Elasticsearch <http://www.elasticsearch.org>
+Copyright (c) 2016 PerimeterX <http://www.perimeterx.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,207 +11,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-=======
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
->>>>>>> 56f47bec0cc3d3230ae48792e7ac094823872298

data/README.md

@@ -110,12 +110,17 @@ Edit Logstash Gemfile and add the local plugin path, for example:
 ```
 gem "logstash-output-cassandra", :path => "/your/local/logstash-output-cassandra"
 ```
-
-Install plugin
+And install by executing:
 ```
 bin/plugin install --no-verify
 ```
-Run Logstash with the plugin
+
+Or install plugin from RubyGems:
+```
+bin/plugin install logstash-output-cassandra
+```
+
+And then run Logstash with the plugin:
 ```
 bin/logstash -e 'output {cassandra {}}'
 ```

data/lib/logstash/outputs/cassandra.rb

@@ -40,6 +40,8 @@ class LogStash::Outputs::CassandraOutput < LogStash::Outputs::Base
   # An optional hash describing how / what to transform / filter from the original event
   # Each key is expected to be of the form { event_key => "..." column_name => "..." cassandra_type => "..." }
   # Event level processing (e.g. %{[key]}) is supported for all three
+  # In case you only want to do string expansion (e.g. in the case of adding event specific dates) you can add the expansion_only key with a value of true
+  # Example: using { event_key => "%{+yyyyMMddHH}" column_name => "date" expansion_only => true } will result in a date column with a string of the specified format
   config :filter_transform, :validate => :array, :default => []
 
   # An optional string which points to the event specific location from which to pull the filter_transform definition

data/lib/logstash/outputs/cassandra/event_parser.rb

@@ -17,18 +17,22 @@ module LogStash; module Outputs; module Cassandra
 
     def parse(event)
       action = {}
-      action['table'] = event.sprintf(@table)
-      filter_transform = get_filter_transform(event)
-      if filter_transform
-        action['data'] = {}
-        filter_transform.each { |filter|
-          add_event_value_from_filter_to_action(event, filter, action)
-        }
-      else
-        add_event_data_using_configured_hints(event, action)
+      begin
+        action['table'] = event.sprintf(@table)
+        filter_transform = get_filter_transform(event)
+        if filter_transform
+          action['data'] = {}
+          filter_transform.each { |filter|
+            add_event_value_from_filter_to_action(event, filter, action)
+          }
+        else
+          add_event_data_using_configured_hints(event, action)
+        end
+        @logger.debug('event parsed to action', :action => action)
+      rescue Exception => e
+        @logger.error('failed parsing event', :event => event, :error => e)
+        action = nil
       end
-
-      @logger.debug('event parsed to action', :action => action)
       action
     end
 

data/lib/logstash/outputs/cassandra/safe_submitter.rb

@@ -57,8 +57,10 @@ module LogStash; module Outputs; module Cassandra
       remaining_queries = Queue.new
       actions.each do |action|
         begin
-          query = get_query(action)
-          remaining_queries << { :query => query, :arguments => action['data'].values }
+          if action
+            query = get_query(action)
+            remaining_queries << { :query => query, :arguments => action['data'].values }
+          end
         rescue Exception => e
           @logger.error('Failed to prepare query', :action => action, :exception => e, :backtrace => e.backtrace)
         end

data/logstash-output-cassandra.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-cassandra'
-  s.version         = '0.9.0'
+  s.version         = '0.9.1'
   s.licenses        = [ 'Apache License (2.0)' ]
   s.summary         = 'Store events into Cassandra'
   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'

data/spec/unit/outputs/event_parser_spec.rb

@@ -40,7 +40,7 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
   describe 'filter transforms' do
     describe 'from config' do
       describe 'malformed configurations' do
-        it 'fails if the transform has no event_data setting' do
+        it 'fails if the transform has no event_key setting' do
           expect { sut.new(default_opts.update({ 'filter_transform' => [{ 'column_name' => '' }] })) }.to raise_error(/item is incorrectly configured/)
         end
 
@@ -170,9 +170,10 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
           options = default_opts.update({ 'filter_transform' => [{ 'event_key' => 'a_field', 'column_name' => 'a_column', 'cassandra_type' => 'what?!' }] })
           sut_instance = sut.new(options)
           sample_event['a_field'] = 'a_value'
-          expect(options['logger']).to(receive(:error))
+          expect(options['logger']).to(receive(:error)).at_least(:once)
 
-          expect { sut_instance.parse(sample_event) }.to raise_error(/Cannot convert/)
+          result = sut_instance.parse(sample_event)
+          expect(result).to be_nil
         end
       end
     end
@@ -238,21 +239,23 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
     it 'fails for unknown hint types' do
       options = default_opts.update({ 'hints' => { 'a_field' => 'not_a_real_type' } })
       sut_instance = sut.new(options)
-      expect(options['logger']).to(receive(:error))
-
+      expect(options['logger']).to(receive(:error)).at_least(:once)
       sample_event['a_field'] = 'a value'
 
-      expect { sut_instance.parse(sample_event) }.to raise_error(/Cannot convert/)
+      result = sut_instance.parse(sample_event)
+
+      expect(result).to be_nil
     end
 
     it 'fails for unsuccessful hint conversion' do
       options = default_opts.update({ 'hints' => { 'a_field' => 'int' } })
-      expect(options['logger']).to(receive(:error))
-
+      expect(options['logger']).to(receive(:error)).at_least(:once)
       sut_instance = sut.new(options)
-
       sample_event['a_field'] = 'i am not an int!!!'
-      expect { sut_instance.parse(sample_event) }.to raise_error(/Cannot convert/)
+
+      result = sut_instance.parse(sample_event)
+
+      expect(result).to be_nil
     end
   end
 
@@ -297,8 +300,11 @@ RSpec.describe LogStash::Outputs::Cassandra::EventParser do
       options = default_opts.update({ 'ignore_bad_values' => true, 'hints' => { 'a_field' => 'map<float>' } })
       sut_instance = sut.new(options)
       sample_event['a_field'] = 'i am not a set'
+      expect(options['logger']).to(receive(:error))
+
+      result = sut_instance.parse(sample_event)
 
-      expect { sut_instance.parse(sample_event) }.to raise_error ArgumentError
+      expect(result).to be_nil
     end
   end
 end

data/spec/unit/outputs/safe_submitter_spec.rb

@@ -109,6 +109,15 @@ RSpec.describe LogStash::Outputs::Cassandra::SafeSubmitter do
       return future_double
     end
 
+    it 'does nothing in case it got a nil action' do
+      doubles = setup_session_double(default_options)
+      expect(doubles[:session_double]).to_not(receive(:prepare))
+      expect(doubles[:session_double]).to_not(receive(:execute_async))
+      sut_instance = sut.new(default_options)
+
+      expect { sut_instance.submit([nil]) }.to_not raise_error
+    end
+
     it 'prepares and executes the query' do
       doubles = setup_session_double(default_options)
       expect(doubles[:session_double]).to(receive(:prepare).with(expected_query_for_one_action)).and_return('eureka')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-cassandra
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - PerimeterX
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement