logstash-output-neo4j 0.9.1-java → 0.9.2-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c8eac613911121680719a1f4192b0d76abb4c183
4
- data.tar.gz: c7ef5e9d9b4a657da13d2cbc2c70a9e46d87e1bb
3
+ metadata.gz: 8fd6a74501c5bc65c7227c52e2ed5ed7ee45526a
4
+ data.tar.gz: d74a1db79392c8c502c26789ad48ffd4154b6b37
5
5
  SHA512:
6
- metadata.gz: 929a380239511d9c91aa9f0fe5853befb765ed6ed8f18794a0851962fd2a82daab5f44ddedd55dfa6909e8d2d9542cf05100e4e61aee34313fc252c5f5b841eb
7
- data.tar.gz: 31eb27bcaf59de2be2b9d09b5f70cbb9232df41e34a6cf93f15dd01263c28f64afebe7526d13ebc8256d56885d078e1a57f816cddf553e2269009b54614808ab
6
+ metadata.gz: 86a26030bbeb9f3b164e8265a055724ec01a6610b9f630f4c4c1c4809cd2ac20a84ef6eaa6a5fa93a0b6b5e1050de9220a29c707144cdca203a66f14349e6a2e
7
+ data.tar.gz: c01b7699812044e51918beae7e07e49e75fa533e36c9891163411cfd21e6b5a70ecd7a79d3af3dfedee616a8a144b647b15aebfbb45de090ab1ccfc6cce13573
data/.gitignore CHANGED
@@ -1,3 +1,4 @@
1
+ *.lock
1
2
  *.gem
2
3
  *.rbc
3
4
  /.config
@@ -22,13 +23,14 @@ build/
22
23
 
23
24
  ## Environment normalisation:
24
25
  /.bundle/
26
+ /vendor/bundle
25
27
  /lib/bundler/man/
26
28
 
27
29
  # for a library or gem, you might want to ignore these files since the code is
28
30
  # intended to run in multiple environments; otherwise, check them in:
29
- Gemfile.lock
30
- .ruby-version
31
- .ruby-gemset
31
+ # Gemfile.lock
32
+ # .ruby-version
33
+ # .ruby-gemset
32
34
 
33
35
  # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
34
36
  .rvmrc
data/CONTRIBUTORS ADDED
@@ -0,0 +1,11 @@
1
+ The following is a list of people who have contributed ideas, code, bug
2
+ reports, or in general have helped logstash along its way.
3
+
4
+ Contributors:
5
+ * Aaron Mildenstein (untergeek)
6
+ * Pier-Hugues Pellerin (ph)
7
+
8
+ Note: If you've sent us patches, bug reports, or otherwise contributed to
9
+ Logstash, and you aren't on the list above and want to be, please let us know
10
+ and we'll make sure you're here. Contributions from folks like you are what make
11
+ open source awesome.
data/LICENSE CHANGED
@@ -1,202 +1,13 @@
1
- Apache License
2
- Version 2.0, January 2004
3
- http://www.apache.org/licenses/
1
+ Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
4
2
 
5
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
3
+ Licensed under the Apache License, Version 2.0 (the "License");
4
+ you may not use this file except in compliance with the License.
5
+ You may obtain a copy of the License at
6
6
 
7
- 1. Definitions.
8
-
9
- "License" shall mean the terms and conditions for use, reproduction,
10
- and distribution as defined by Sections 1 through 9 of this document.
11
-
12
- "Licensor" shall mean the copyright owner or entity authorized by
13
- the copyright owner that is granting the License.
14
-
15
- "Legal Entity" shall mean the union of the acting entity and all
16
- other entities that control, are controlled by, or are under common
17
- control with that entity. For the purposes of this definition,
18
- "control" means (i) the power, direct or indirect, to cause the
19
- direction or management of such entity, whether by contract or
20
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
- outstanding shares, or (iii) beneficial ownership of such entity.
22
-
23
- "You" (or "Your") shall mean an individual or Legal Entity
24
- exercising permissions granted by this License.
25
-
26
- "Source" form shall mean the preferred form for making modifications,
27
- including but not limited to software source code, documentation
28
- source, and configuration files.
29
-
30
- "Object" form shall mean any form resulting from mechanical
31
- transformation or translation of a Source form, including but
32
- not limited to compiled object code, generated documentation,
33
- and conversions to other media types.
34
-
35
- "Work" shall mean the work of authorship, whether in Source or
36
- Object form, made available under the License, as indicated by a
37
- copyright notice that is included in or attached to the work
38
- (an example is provided in the Appendix below).
39
-
40
- "Derivative Works" shall mean any work, whether in Source or Object
41
- form, that is based on (or derived from) the Work and for which the
42
- editorial revisions, annotations, elaborations, or other modifications
43
- represent, as a whole, an original work of authorship. For the purposes
44
- of this License, Derivative Works shall not include works that remain
45
- separable from, or merely link (or bind by name) to the interfaces of,
46
- the Work and Derivative Works thereof.
47
-
48
- "Contribution" shall mean any work of authorship, including
49
- the original version of the Work and any modifications or additions
50
- to that Work or Derivative Works thereof, that is intentionally
51
- submitted to Licensor for inclusion in the Work by the copyright owner
52
- or by an individual or Legal Entity authorized to submit on behalf of
53
- the copyright owner. For the purposes of this definition, "submitted"
54
- means any form of electronic, verbal, or written communication sent
55
- to the Licensor or its representatives, including but not limited to
56
- communication on electronic mailing lists, source code control systems,
57
- and issue tracking systems that are managed by, or on behalf of, the
58
- Licensor for the purpose of discussing and improving the Work, but
59
- excluding communication that is conspicuously marked or otherwise
60
- designated in writing by the copyright owner as "Not a Contribution."
61
-
62
- "Contributor" shall mean Licensor and any individual or Legal Entity
63
- on behalf of whom a Contribution has been received by Licensor and
64
- subsequently incorporated within the Work.
65
-
66
- 2. Grant of Copyright License. Subject to the terms and conditions of
67
- this License, each Contributor hereby grants to You a perpetual,
68
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
- copyright license to reproduce, prepare Derivative Works of,
70
- publicly display, publicly perform, sublicense, and distribute the
71
- Work and such Derivative Works in Source or Object form.
72
-
73
- 3. Grant of Patent License. Subject to the terms and conditions of
74
- this License, each Contributor hereby grants to You a perpetual,
75
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
- (except as stated in this section) patent license to make, have made,
77
- use, offer to sell, sell, import, and otherwise transfer the Work,
78
- where such license applies only to those patent claims licensable
79
- by such Contributor that are necessarily infringed by their
80
- Contribution(s) alone or by combination of their Contribution(s)
81
- with the Work to which such Contribution(s) was submitted. If You
82
- institute patent litigation against any entity (including a
83
- cross-claim or counterclaim in a lawsuit) alleging that the Work
84
- or a Contribution incorporated within the Work constitutes direct
85
- or contributory patent infringement, then any patent licenses
86
- granted to You under this License for that Work shall terminate
87
- as of the date such litigation is filed.
88
-
89
- 4. Redistribution. You may reproduce and distribute copies of the
90
- Work or Derivative Works thereof in any medium, with or without
91
- modifications, and in Source or Object form, provided that You
92
- meet the following conditions:
93
-
94
- (a) You must give any other recipients of the Work or
95
- Derivative Works a copy of this License; and
96
-
97
- (b) You must cause any modified files to carry prominent notices
98
- stating that You changed the files; and
99
-
100
- (c) You must retain, in the Source form of any Derivative Works
101
- that You distribute, all copyright, patent, trademark, and
102
- attribution notices from the Source form of the Work,
103
- excluding those notices that do not pertain to any part of
104
- the Derivative Works; and
105
-
106
- (d) If the Work includes a "NOTICE" text file as part of its
107
- distribution, then any Derivative Works that You distribute must
108
- include a readable copy of the attribution notices contained
109
- within such NOTICE file, excluding those notices that do not
110
- pertain to any part of the Derivative Works, in at least one
111
- of the following places: within a NOTICE text file distributed
112
- as part of the Derivative Works; within the Source form or
113
- documentation, if provided along with the Derivative Works; or,
114
- within a display generated by the Derivative Works, if and
115
- wherever such third-party notices normally appear. The contents
116
- of the NOTICE file are for informational purposes only and
117
- do not modify the License. You may add Your own attribution
118
- notices within Derivative Works that You distribute, alongside
119
- or as an addendum to the NOTICE text from the Work, provided
120
- that such additional attribution notices cannot be construed
121
- as modifying the License.
122
-
123
- You may add Your own copyright statement to Your modifications and
124
- may provide additional or different license terms and conditions
125
- for use, reproduction, or distribution of Your modifications, or
126
- for any such Derivative Works as a whole, provided Your use,
127
- reproduction, and distribution of the Work otherwise complies with
128
- the conditions stated in this License.
129
-
130
- 5. Submission of Contributions. Unless You explicitly state otherwise,
131
- any Contribution intentionally submitted for inclusion in the Work
132
- by You to the Licensor shall be under the terms and conditions of
133
- this License, without any additional terms or conditions.
134
- Notwithstanding the above, nothing herein shall supersede or modify
135
- the terms of any separate license agreement you may have executed
136
- with Licensor regarding such Contributions.
137
-
138
- 6. Trademarks. This License does not grant permission to use the trade
139
- names, trademarks, service marks, or product names of the Licensor,
140
- except as required for reasonable and customary use in describing the
141
- origin of the Work and reproducing the content of the NOTICE file.
142
-
143
- 7. Disclaimer of Warranty. Unless required by applicable law or
144
- agreed to in writing, Licensor provides the Work (and each
145
- Contributor provides its Contributions) on an "AS IS" BASIS,
146
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
- implied, including, without limitation, any warranties or conditions
148
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
- PARTICULAR PURPOSE. You are solely responsible for determining the
150
- appropriateness of using or redistributing the Work and assume any
151
- risks associated with Your exercise of permissions under this License.
152
-
153
- 8. Limitation of Liability. In no event and under no legal theory,
154
- whether in tort (including negligence), contract, or otherwise,
155
- unless required by applicable law (such as deliberate and grossly
156
- negligent acts) or agreed to in writing, shall any Contributor be
157
- liable to You for damages, including any direct, indirect, special,
158
- incidental, or consequential damages of any character arising as a
159
- result of this License or out of the use or inability to use the
160
- Work (including but not limited to damages for loss of goodwill,
161
- work stoppage, computer failure or malfunction, or any and all
162
- other commercial damages or losses), even if such Contributor
163
- has been advised of the possibility of such damages.
164
-
165
- 9. Accepting Warranty or Additional Liability. While redistributing
166
- the Work or Derivative Works thereof, You may choose to offer,
167
- and charge a fee for, acceptance of support, warranty, indemnity,
168
- or other liability obligations and/or rights consistent with this
169
- License. However, in accepting such obligations, You may act only
170
- on Your own behalf and on Your sole responsibility, not on behalf
171
- of any other Contributor, and only if You agree to indemnify,
172
- defend, and hold each Contributor harmless for any liability
173
- incurred by, or claims asserted against, such Contributor by reason
174
- of your accepting any such warranty or additional liability.
175
-
176
- END OF TERMS AND CONDITIONS
177
-
178
- APPENDIX: How to apply the Apache License to your work.
179
-
180
- To apply the Apache License to your work, attach the following
181
- boilerplate notice, with the fields enclosed by brackets "{}"
182
- replaced with your own identifying information. (Don't include
183
- the brackets!) The text should be enclosed in the appropriate
184
- comment syntax for the file format. We also recommend that a
185
- file or class name and description of purpose be included on the
186
- same "printed page" as the copyright notice for easier
187
- identification within third-party archives.
188
-
189
- Copyright {yyyy} {name of copyright owner}
190
-
191
- Licensed under the Apache License, Version 2.0 (the "License");
192
- you may not use this file except in compliance with the License.
193
- You may obtain a copy of the License at
194
-
195
- http://www.apache.org/licenses/LICENSE-2.0
196
-
197
- Unless required by applicable law or agreed to in writing, software
198
- distributed under the License is distributed on an "AS IS" BASIS,
199
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
- See the License for the specific language governing permissions and
201
- limitations under the License.
7
+ http://www.apache.org/licenses/LICENSE-2.0
202
8
 
9
+ Unless required by applicable law or agreed to in writing, software
10
+ distributed under the License is distributed on an "AS IS" BASIS,
11
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ See the License for the specific language governing permissions and
13
+ limitations under the License.
data/README.md CHANGED
@@ -1,4 +1,86 @@
1
- logstash-output-neo4j
2
- =====================
1
+ # Logstash Plugin
3
2
 
4
- This is the first version of a Logstash Neo4j output plugin
3
+ This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
4
+
5
+ It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
6
+
7
+ ## Documentation
8
+
9
+ Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
10
+
11
+ - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
12
+ - For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
13
+
14
+ ## Need Help?
15
+
16
+ Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
17
+
18
+ ## Developing
19
+
20
+ ### 1. Plugin Developement and Testing
21
+
22
+ #### Code
23
+ - To get started, you'll need JRuby with the Bundler gem installed.
24
+
25
+ - Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
26
+
27
+ - Install dependencies
28
+ ```sh
29
+ bundle install
30
+ ```
31
+
32
+ #### Test
33
+
34
+ - Update your dependencies
35
+
36
+ ```sh
37
+ bundle install
38
+ ```
39
+
40
+ - Run tests
41
+
42
+ ```sh
43
+ bundle exec rspec
44
+ ```
45
+
46
+ ### 2. Running your unpublished Plugin in Logstash
47
+
48
+ #### 2.1 Run in a local Logstash clone
49
+
50
+ - Edit Logstash `Gemfile` and add the local plugin path, for example:
51
+ ```ruby
52
+ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
53
+ ```
54
+ - Install plugin
55
+ ```sh
56
+ bin/plugin install --no-verify
57
+ ```
58
+ - Run Logstash with your plugin
59
+ ```sh
60
+ bin/logstash -e 'filter {awesome {}}'
61
+ ```
62
+ At this point any modifications to the plugin code will be applied to this local Logstash setup. After modifying the plugin, simply rerun Logstash.
63
+
64
+ #### 2.2 Run in an installed Logstash
65
+
66
+ You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory or you can build the gem and install it using:
67
+
68
+ - Build your plugin gem
69
+ ```sh
70
+ gem build logstash-filter-awesome.gemspec
71
+ ```
72
+ - Install the plugin from the Logstash home
73
+ ```sh
74
+ bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
75
+ ```
76
+ - Start Logstash and proceed to test the plugin
77
+
78
+ ## Contributing
79
+
80
+ All contributions are welcome: ideas, patches, documentation, bug reports, complaints, and even something you drew up on a napkin.
81
+
82
+ Programming is not a required skill. Whatever you've seen about open source and maintainers or community members saying "send patches or die" - you will not see that here.
83
+
84
+ It is more important to the community that you are able to contribute.
85
+
86
+ For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
data/Rakefile CHANGED
@@ -12,6 +12,8 @@ rescue Bundler::BundlerError => e
12
12
  exit e.status_code
13
13
  end
14
14
 
15
+ require 'logstash/devutils/rake'
16
+
15
17
  require 'rspec'
16
18
  require 'rspec/core/rake_task'
17
19
 
@@ -1,6 +1,5 @@
1
- require 'logstash/namespace'
2
- require 'logstash/outputs/base'
3
- require 'logstash/outputs/timetree/timetree'
1
+ require "logstash/namespace"
2
+ require "logstash/outputs/base"
4
3
 
5
4
  class LogStash::Outputs::Neo4j < LogStash::Outputs::Base
6
5
 
@@ -12,9 +11,10 @@ class LogStash::Outputs::Neo4j < LogStash::Outputs::Base
12
11
  attr_reader :tree
13
12
 
14
13
  def register
15
- require 'neo4j'
16
- if Neo4j::Session.current.nil?
17
- @session = ::Neo4j::Session.open(:embedded_db, @path, auto_commit: true)
14
+ require "neo4j"
15
+ require "logstash/outputs/timetree/timetree"
16
+ if !Neo4j::Session.current
17
+ @session = ::Neo4j::Session.open(:embedded_db, @path, :auto_commit => true)
18
18
  @session.start
19
19
  end
20
20
  @session = Neo4j::Session.current
@@ -1,5 +1,5 @@
1
- require 'neo4j'
2
- require 'logstash/outputs/timetree/model'
1
+ require "neo4j"
2
+ require "logstash/outputs/timetree/model"
3
3
 
4
4
  module Neo4jrb
5
5
  class TimeTree
@@ -31,12 +31,10 @@ module Neo4jrb
31
31
  MATCH (a:`TimeTree::Year`{value:#{start_time.year}})-[:`child`]->(b:`TimeTree::Month`{value:#{start_time.month}})-[:`child`]->(d:`TimeTree::Day`{value:#{start_time.day}})
32
32
  WITH d MATCH (e:`TimeTree::Event`)<-[:`child`]-(d)
33
33
  RETURN e
34
- QUERY
35
- resultset = Neo4j::Session.query(query)
36
- resultset.map { |r| r.e }.to_a
34
+ QUERY
35
+ run_query(query)
37
36
  end
38
37
 
39
-
40
38
  def refresh_tree(ts)
41
39
  year = append_element(@root, ::TimeTree::Year, ts.year)
42
40
  month = append_element(year, ::TimeTree::Month, ts.month)
@@ -54,7 +52,7 @@ module Neo4jrb
54
52
  selected = childs.select { |e| e.props[:value] == value }
55
53
  return selected.first if !selected.empty?
56
54
  end
57
- node = find_or_create(clazz, root, {:value => value})
55
+ node = find_or_create(clazz, root, {:value => value})
58
56
  set_edge_to_first_node(root, node) if childs.empty?
59
57
  ::TimeTree::Child.create(:from_node => root, :to_node => node)
60
58
  set_edge_to_last_node(root, node)
@@ -67,7 +65,7 @@ module Neo4jrb
67
65
  p.class == root.class && (!root.is_a?(::TimeTree::Root) && p.props[:value] == root.props[:value])
68
66
  end
69
67
  end.flatten
70
- if nodes.empty? then clazz.create(criteria) else nodes.first end
68
+ ( nodes.empty? ? clazz.create(criteria) : nodes.first )
71
69
  end
72
70
 
73
71
  def set_edge_to_first_node(root, node)
@@ -98,5 +96,11 @@ module Neo4jrb
98
96
  base.nodes(:dir => dir, :type => :child)
99
97
  end
100
98
 
99
+ private
100
+ def run_query(query)
101
+ resultset = Neo4j::Session.query(query)
102
+ resultset.map(&:e).to_a
103
+ end
104
+
101
105
  end
102
106
  end
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-output-neo4j'
4
- s.version = '0.9.1'
4
+ s.version = '0.9.2'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "Logstash Output to Neo4j"
7
7
  s.description = "Output events to Neo4j"
@@ -1,4 +1,5 @@
1
1
  require 'spec_helper'
2
+ require "logstash/outputs/timetree/timetree"
2
3
 
3
4
  describe 'Neo4jrb::Timetree' do
4
5
 
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require_relative "../spec_helper"
2
2
  require "logstash/plugin"
3
3
  require "logstash/json"
4
4
 
@@ -9,12 +9,12 @@ describe "outputs/neo4j" do
9
9
  let(:output) { LogStash::Plugin.lookup("output", "neo4j").new("path" => "/tmp/db") }
10
10
 
11
11
  it "should register" do
12
- expect {output.register}.to_not raise_error
12
+ expect { output.register }.to_not raise_error
13
13
  end
14
14
 
15
15
  it "should teardown" do
16
16
  output.register
17
- expect {output.teardown}.to_not raise_error
17
+ expect { output.teardown }.to_not raise_error
18
18
  end
19
19
  end
20
20
 
@@ -31,7 +31,7 @@ describe "outputs/neo4j" do
31
31
 
32
32
  it "receive a message" do
33
33
  output.receive(event)
34
- events = tree.events_at(event.to_hash["@timestamp"].time)
34
+ events = tree.events_at(event.to_hash["@timestamp"].time)
35
35
  expect(events.count).to eq(1)
36
36
  end
37
37
 
data/spec/spec_helper.rb CHANGED
@@ -1,4 +1,5 @@
1
- require 'logstash/outputs/neo4j'
1
+ require "neo4j"
2
+ require "logstash/outputs/neo4j"
2
3
 
3
4
  def load_fixture(name)
4
5
  IO.read("spec/fixtures/#{name}")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-neo4j
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1
4
+ version: 0.9.2
5
5
  platform: java
6
6
  authors:
7
7
  - Pere Urbon-Bayes
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-27 00:00:00.000000000 Z
11
+ date: 2015-05-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: logstash-core
@@ -107,7 +107,7 @@ extensions: []
107
107
  extra_rdoc_files: []
108
108
  files:
109
109
  - .gitignore
110
- - .rspec
110
+ - CONTRIBUTORS
111
111
  - Gemfile
112
112
  - LICENSE
113
113
  - README.md
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
141
141
  version: '0'
142
142
  requirements: []
143
143
  rubyforge_project:
144
- rubygems_version: 2.4.5
144
+ rubygems_version: 2.1.9
145
145
  signing_key:
146
146
  specification_version: 4
147
147
  summary: Logstash Output to Neo4j
data/.rspec DELETED
@@ -1,3 +0,0 @@
1
- --format documentation
2
- --color
3
-