Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

command not found #8

Open
wants to merge 135 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
b58f7d8
removing use of git and changed log stash version to below 3
eladamitpxi Mar 1, 2016
51d768c
bumping plugin version and setting the required plugin versions
eladamitpxi Mar 2, 2016
b127fbe
adding a thread safe buffer similar to what is used in the ES output …
eladamitpxi Mar 2, 2016
f533371
moved retry policy to the cassandra driver with control over the spec…
eladamitpxi Mar 2, 2016
326c08f
setup to use jruby and have rspec succeed (even though there are no t…
eladamitpxi Mar 2, 2016
da2e8b4
added hint support when no transform filter is supplied
eladamitpxi Mar 2, 2016
9d71df4
moved files to a folder
eladamitpxi Mar 2, 2016
68d2393
renames of cassandra files and folders to cassandra output
eladamitpxi Mar 2, 2016
849ba7e
extracted safe submitter and event parser from cassandra output
eladamitpxi Mar 2, 2016
594d2c8
some small fixes to get the empty specs to run
eladamitpxi Mar 2, 2016
efb6883
added buffer spec from the es output plugin
eladamitpxi Mar 3, 2016
9a60468
created spec helper
eladamitpxi Mar 3, 2016
c9a1690
moved assert_filter_transform_structure from output to event parser
eladamitpxi Mar 3, 2016
b30e5bb
event parser spec layout
eladamitpxi Mar 3, 2016
fd9d071
event parser - table name parsing - leaves regular table names unchanged
eladamitpxi Mar 3, 2016
6f5f3ba
event parser - table name parser - parses table names with data from …
eladamitpxi Mar 3, 2016
273695a
added malformed transform tests
eladamitpxi Mar 8, 2016
f42b37f
changed spec to test the error itself as well
eladamitpxi Mar 8, 2016
245e224
maps the event key to the column
eladamitpxi Mar 8, 2016
de34652
added .idea to gitignoe
eladamitpxi Mar 8, 2016
1f65620
works with multiple filter transforms
eladamitpxi Mar 8, 2016
096c6ec
allows for event specific event keys
eladamitpxi Mar 8, 2016
98661a4
allows for event specific column names
eladamitpxi Mar 8, 2016
e8380b6
properly maps #{mapping[:name]} to #{mapping[:type]}
eladamitpxi Mar 8, 2016
7805fe3
properly maps sets to their specific set types
eladamitpxi Mar 8, 2016
031b68b
allows for event specific cassandra types
eladamitpxi Mar 8, 2016
1398a6f
obtains the filter transform from the event if defined
eladamitpxi Mar 8, 2016
d4cfed6
hint test stubs
eladamitpxi Mar 8, 2016
98c24c6
removes fields starting with @
eladamitpxi Mar 8, 2016
c731553
does not attempt to change items with no hints
eladamitpxi Mar 8, 2016
de41d77
converts items with hints
eladamitpxi Mar 8, 2016
c0c31f2
fails for unknown hint types
eladamitpxi Mar 8, 2016
523edf1
fails for unsuccessful hint conversion
eladamitpxi Mar 8, 2016
5f83fcf
reformatted to setup-act-assert
eladamitpxi Mar 8, 2016
9badc65
ignore_bad_values is turned on
eladamitpxi Mar 8, 2016
a24cb1e
moved files to the unt test folder
eladamitpxi Mar 8, 2016
ebb78a4
added empty spec for SafeSubmitter
eladamitpxi Mar 8, 2016
8378ab5
added stub files for the casandra output tests
eladamitpxi Mar 8, 2016
c9b3864
changed all string to use double quotes for consistancy
eladamitpxi Mar 9, 2016
742b4db
added safe submitter test skeleton
eladamitpxi Mar 9, 2016
a4f7f4b
changed opts to options
eladamitpxi Mar 9, 2016
45d1bcf
utf 8 headers for all
eladamitpxi Mar 9, 2016
0063e99
properly inits the cassandra session
eladamitpxi Mar 9, 2016
6c79048
remove parantheses from call to sut
eladamitpxi Mar 9, 2016
b2eedfa
switched remaining single quotes to double quotes
eladamitpxi Mar 9, 2016
1043dd5
all retry policies
eladamitpxi Mar 9, 2016
47b4c6e
prepares and executes the query
eladamitpxi Mar 9, 2016
48dad4b
does not confuse between a new query and cached queries
eladamitpxi Mar 9, 2016
a1a25bd
updated cassandra output to use the new helper class interfaces
eladamitpxi Mar 9, 2016
47f1ef8
added port to config
eladamitpxi Mar 9, 2016
d403ca1
added base integratino with docker for integration tests
eladamitpxi Mar 9, 2016
82e9190
a small refactoring
eladamitpxi Mar 9, 2016
2a4e8e9
writting to cassandra works, now we need to assert properly
eladamitpxi Mar 9, 2016
b0cdf33
integration test - properly creates a single event
eladamitpxi Mar 9, 2016
fb0a67f
changed set def format to match table creation in cassandra
eladamitpxi Mar 10, 2016
b949012
simple insert integration test working, now to fix
eladamitpxi Mar 10, 2016
28a1a17
added unit tests to properly cover the type conversion cases we want …
eladamitpxi Mar 10, 2016
3d12159
all types now properly converted :)
eladamitpxi Mar 10, 2016
11fb3c5
remove incorrect query expectation (should not include the keyspace)
eladamitpxi Mar 13, 2016
e549930
renamed output file name
eladamitpxi Mar 13, 2016
adc61fb
added a test to ensure the filters can easily come from the @metadata…
eladamitpxi Mar 13, 2016
96c95d2
added string expansion only option
eladamitpxi Mar 28, 2016
425cbae
updated spec names to match the proper name for string expansion
eladamitpxi Mar 28, 2016
8c934c6
added some debug logging
eladamitpxi Mar 29, 2016
1b5d301
changed the filter transform default to an empty array
eladamitpxi Mar 29, 2016
52d3451
fixed logger double to allow debug message
eladamitpxi Mar 29, 2016
b5e1be4
switched from batches to futures in submitter due to the fact that ba…
eladamitpxi Mar 29, 2016
a774d7d
updated spec name to say bulk instead of batch
eladamitpxi Mar 29, 2016
520de93
adding protocol version to options
eladamitpxi Mar 31, 2016
1482276
changing default protocol version to 4
eladamitpxi Apr 3, 2016
3f835d2
adding logging of errors from the on_complete future callback
eladamitpxi Apr 7, 2016
a47e073
adding missing expectation for future finish
eladamitpxi Apr 7, 2016
608b043
adding coverage support
eladamitpxi Apr 7, 2016
80154a5
added back off retry policy
eladamitpxi Apr 7, 2016
5c1ce9e
empty spec for back off retry policy
eladamitpxi Apr 7, 2016
2c85551
added spec skeleton for the back off policy
eladamitpxi Apr 7, 2016
30edb47
extracted shared examples
eladamitpxi Apr 8, 2016
e5050f8
#retry_with_backoff - runs the block if the max retries have not been…
eladamitpxi Apr 8, 2016
e4d1f35
passes the options it recieves to the yield block
eladamitpxi Apr 8, 2016
13b4c11
stops once the max retries are reached
eladamitpxi Apr 8, 2016
7949165
waits between retries
eladamitpxi Apr 8, 2016
3961ad2
allows for exponential backoffs
eladamitpxi Apr 8, 2016
491bb9d
allows for linear backoffs
eladamitpxi Apr 8, 2016
f4cd242
cleanup of #retry_with_backoff tests
eladamitpxi Apr 8, 2016
2995c7c
returns the value from the yield block
eladamitpxi Apr 8, 2016
7d11259
simplified the retry policy to always retry as long as we havent reac…
eladamitpxi Apr 9, 2016
f63f8ac
public api tests
eladamitpxi Apr 9, 2016
b630a65
fixed incorrectly named let
eladamitpxi Apr 9, 2016
8515bdf
fixing incorrect set default regex and test
eladamitpxi Apr 9, 2016
1e79f0d
added coverage for bad retry policies
eladamitpxi Apr 9, 2016
9970b87
added coverage to failed batch logging
eladamitpxi Apr 9, 2016
30ece3e
adding metric fu, built in coverage calcs, and sonar
eladamitpxi Apr 10, 2016
787a640
adding integration / docker tests to the full run and setting to cass…
eladamitpxi Apr 10, 2016
3adbdc4
cleanup of event parser according to ruby mine
eladamitpxi Apr 11, 2016
a53d8e6
cleanup of safe submiter according to ruby mine
eladamitpxi Apr 11, 2016
7c41ff5
cleanup of backoff retry policy according to ruby mine
eladamitpxi Apr 11, 2016
07fa977
organized the other files to match rubymine checks
eladamitpxi Apr 11, 2016
f6c7292
ignoring .sonar dir
eladamitpxi Apr 11, 2016
1d5c3da
some changes due to metric_fu input
eladamitpxi Apr 11, 2016
a55448d
fixed incorrect call to action['data'] before populating it
eladamitpxi Apr 12, 2016
85ff071
rubymine issue hints / fixes
eladamitpxi Apr 12, 2016
bc7c8e2
added option for infinite retries
eladamitpxi Apr 12, 2016
ec93d40
added basic retry on future failures
eladamitpxi Apr 12, 2016
a28b672
added future failure / timeout retries based on the backoff retry pol…
eladamitpxi Apr 12, 2016
b993d0f
switching default timeout to 1 second
eladamitpxi Apr 13, 2016
58d4359
removing trailling spaces
eladamitpxi Apr 13, 2016
18742ad
added some simple comments and updated readme
eladamitpxi Apr 13, 2016
7401fc5
updates towards publishing
eladamitpxi Apr 15, 2016
a243d3e
updates towards publishing
eladamitpxi Apr 15, 2016
ed85604
adding valentinul to the contributor list
eladamitpxi Apr 23, 2016
2c11b76
Merge pull request #1 from eladamitpxi/dev-logstash2
eladamitpxi Apr 24, 2016
591efa9
removing incorrect auth todo
eladamitpxi Apr 24, 2016
970d25b
updated / fixed the license file
eladamitpxi Apr 26, 2016
be82df6
updated / fixed the license file
eladamitpxi Apr 26, 2016
7a6413c
updated / fixed the license file
eladamitpxi Apr 26, 2016
06156ac
updated / fixed the license file
eladamitpxi Apr 27, 2016
b24e3be
fixing a type in the filter transform test name
eladamitpxi May 1, 2016
b346933
added documentation for expand_only
eladamitpxi May 1, 2016
a3c4acd
changing version around for testing
eladamitpxi May 23, 2016
19c8a0d
changed the event parser to return a nil action in case of a parsing …
eladamitpxi May 23, 2016
79e6639
Merge branch 'dev-fix-restart-on-parse-error'
eladamitpxi May 23, 2016
922c7ea
Create a new hash of action_data instead of assign from event.to_hash
tansinee Sep 8, 2016
d30007f
Shorten re-assignement
tansinee Sep 9, 2016
54bd869
Merge branch 'master' into dev-cass-3
eladamitpxi Sep 16, 2016
317c953
make compattible with Cassandra 3.0
roongr2k7 Aug 31, 2016
57dd6e2
resolve conflict
roongr2k7 Sep 18, 2016
c45aea1
Merge pull request #2 from roongr2k7/cassandra3.0
eladamitpxi Sep 19, 2016
9b03a00
Merge pull request #3 from tansinee/master
eladamitpxi Sep 19, 2016
0a860bc
bumping version for release
eladamitpxi Sep 19, 2016
114cfab
updated contributors with tansinee
eladamitpxi Sep 19, 2016
df2d201
updated contributors, and bumping versions
eladamitpxi Sep 19, 2016
bb5629c
Merge branch 'master' into dev-cass-3
eladamitpxi Sep 19, 2016
bb791a5
Merge pull request #4 from PerimeterX/dev-cass-3
eladamitpxi Sep 19, 2016
e430951
updated with logstash 5 APIs
eladamitpxi Oct 30, 2016
172b826
Merge pull request #5 from PerimeterX/dev-logstash-5
eladamitpxi Oct 30, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
Gemfile.lock
.bundle
vendor
/nbproject/private/
/nbproject/private/
.idea
coverage
tmp
.sonar
26 changes: 7 additions & 19 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
The following is a list of people who have contributed ideas, code, bug
reports, or in general have helped logstash along its way.
The following is a list of people who have contributed (in chronological order) ideas, code, bug
reports, or in general have helped this plugin along its way.

Contributors:
* Aaron Mildenstein (untergeek)
* Graham Bleach (bleach)
* John E. Vincent (lusis)
* Jordan Sissel (jordansissel)
* Kevin Amorin (kamorin)
* Kevin O'Connor (kjoconnor)
* Kurt Hurtado (kurtado)
* Mathias Gug (zimathias)
* Pete Fritchman (fetep)
* Pier-Hugues Pellerin (ph)
* Richard Pijnenburg (electrical)
* bitsofinfo (bitsofinfo)

Note: If you've sent us patches, bug reports, or otherwise contributed to
Logstash, and you aren't on the list above and want to be, please let us know
and we'll make sure you're here. Contributions from folks like you are what make
open source awesome.
* Oleg Tokarev (otokarev)
* Elad Amit (eladamitpxi, amitelad7)
* Valentin Fischer (valentinul)
* tansinee
* Pitsanu Swangpheaw (roongr2k7)
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
#ruby=jruby
#ruby-gemset=logstash-output-cassandra
source 'https://rubygems.org'
gemspec
gemspec
207 changes: 1 addition & 206 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Loading