logstash-filter-collate 0.1.6 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/NOTICE.TXT +5 -0
  4. data/README.md +5 -5
  5. data/lib/logstash/filters/collate.rb +2 -1
  6. data/logstash-filter-collate.gemspec +3 -3
  7. metadata +24 -24
  8. data/.gitignore +0 -4
  9. data/Rakefile +0 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a3c5ff1f73bafa7410662326f20d6ac0194da5c9
4
- data.tar.gz: 6f10d79e09357f6ca99564c4dc1f3deed395e701
3
+ metadata.gz: 7efe52c7d22b21ab326946f0bb6e6291bd75876d
4
+ data.tar.gz: 361ac8b6cbb9c75af5b6674ba62365e7ec40ea0c
5
5
  SHA512:
6
- metadata.gz: cac767b5611243bc66f6e08da190c56b7d0521b604287c01e723b1977b90c75f20be8496da3d772e8359c591c9708d6b0ab6900a23b2949ff159a9639234bb81
7
- data.tar.gz: 7a128b63b54db14f31f5a8b03f0aa946f1293a54c4047aec72802f7bb594e8cf7a30123fb71c032e12cc12e551ba692644f89724bf00a08b59190d181656f7c7
6
+ metadata.gz: d37d0be5f219dbde6aea45980b000900a55ba6ded83bad9769bb7d58dd843e5f965f9c2d192dfe89be1af38563b9bb3a48990488d3e9d18b374814696df00026
7
+ data.tar.gz: 0f72765eb5c96b89dea1a51ede98e2b7e2678c0da737aa6f76d8d69a7fa9c2a3e403a6ae671047183b424ae3e748afe17371812f82731b40ac979ced46c0e0ab
data/CHANGELOG.md ADDED
@@ -0,0 +1,5 @@
1
+ ## 2.0.0
2
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
3
+ instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
4
+ - Dependency on logstash-core update to 2.0
5
+
data/NOTICE.TXT ADDED
@@ -0,0 +1,5 @@
1
+ Elasticsearch
2
+ Copyright 2012-2015 Elasticsearch
3
+
4
+ This product includes software developed by The Apache Software
5
+ Foundation (http://www.apache.org/).
data/README.md CHANGED
@@ -1,19 +1,19 @@
1
1
  # Logstash Plugin
2
2
 
3
- This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
3
+ This is a plugin for [Logstash](https://github.com/elastic/logstash).
4
4
 
5
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
6
 
7
7
  ## Documentation
8
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/).
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.elastic.co/guide/en/logstash/current/).
10
10
 
11
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
12
+ - For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
13
13
 
14
14
  ## Need Help?
15
15
 
16
- Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
16
+ Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
17
17
 
18
18
  ## Developing
19
19
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
83
83
 
84
84
  It is more important to the community that you are able to contribute.
85
85
 
86
- For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
86
+ For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.
data/lib/logstash/filters/collate.rb CHANGED
@@ -59,7 +59,7 @@ class LogStash::Filters::Collate < LogStash::Filters::Base
59
59
  end
60
60
 
61
61
  # if the event is collated, a "collated" tag will be marked, so for those uncollated event, cancel them first.
62
- if event["tags"].nil? || !event.tags.include?("collated")
62
+ if event["tags"].nil? || !event["tags"].include?("collated")
63
63
  event.cancel
64
64
  else
65
65
  return
@@ -103,6 +103,7 @@ class LogStash::Filters::Collate < LogStash::Filters::Base
103
103
  if (@collatingDone)
104
104
  @mutex.synchronize{
105
105
  while collatedEvent = @collatingArray.pop
106
+ collatedEvent["tags"] = Array.new if collatedEvent["tags"].nil?
106
107
  collatedEvent["tags"] << "collated"
107
108
  events << collatedEvent
108
109
  end # while @collatingArray.pop
data/logstash-filter-collate.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-filter-collate'
4
- s.version = '0.1.6'
4
+ s.version = '2.0.1'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "Collate events by time or count"
7
7
  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"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
11
11
  s.require_paths = ["lib"]
12
12
 
13
13
  # Files
14
- s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
14
+ s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
15
15
 
16
16
  # Tests
17
17
  s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
20
20
  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
21
21
 
22
22
  # Gem dependencies
23
- s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
23
+ s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
24
24
  s.add_runtime_dependency 'rufus-scheduler', ['~> 3.0.9']
25
25
 
26
26
  s.add_development_dependency 'logstash-devutils'
metadata CHANGED
@@ -1,75 +1,75 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-filter-collate
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-27 00:00:00.000000000 Z
11
+ date: 2015-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: logstash-core
15
- version_requirements: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - '>='
18
- - !ruby/object:Gem::Version
19
- version: 1.4.0
20
- - - <
21
- - !ruby/object:Gem::Version
22
- version: 2.0.0
23
14
  requirement: !ruby/object:Gem::Requirement
24
15
  requirements:
25
16
  - - '>='
26
17
  - !ruby/object:Gem::Version
27
- version: 1.4.0
18
+ version: 2.0.0.snapshot
28
19
  - - <
29
20
  - !ruby/object:Gem::Version
30
- version: 2.0.0
21
+ version: 3.0.0
22
+ name: logstash-core
31
23
  prerelease: false
32
24
  type: :runtime
33
- - !ruby/object:Gem::Dependency
34
- name: rufus-scheduler
35
25
  version_requirements: !ruby/object:Gem::Requirement
36
26
  requirements:
37
- - - ~>
27
+ - - '>='
38
28
  - !ruby/object:Gem::Version
39
- version: 3.0.9
29
+ version: 2.0.0.snapshot
30
+ - - <
31
+ - !ruby/object:Gem::Version
32
+ version: 3.0.0
33
+ - !ruby/object:Gem::Dependency
40
34
  requirement: !ruby/object:Gem::Requirement
41
35
  requirements:
42
36
  - - ~>
43
37
  - !ruby/object:Gem::Version
44
38
  version: 3.0.9
39
+ name: rufus-scheduler
45
40
  prerelease: false
46
41
  type: :runtime
47
- - !ruby/object:Gem::Dependency
48
- name: logstash-devutils
49
42
  version_requirements: !ruby/object:Gem::Requirement
50
43
  requirements:
51
- - - '>='
44
+ - - ~>
52
45
  - !ruby/object:Gem::Version
53
- version: '0'
46
+ version: 3.0.9
47
+ - !ruby/object:Gem::Dependency
54
48
  requirement: !ruby/object:Gem::Requirement
55
49
  requirements:
56
50
  - - '>='
57
51
  - !ruby/object:Gem::Version
58
52
  version: '0'
53
+ name: logstash-devutils
59
54
  prerelease: false
60
55
  type: :development
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ requirements:
58
+ - - '>='
59
+ - !ruby/object:Gem::Version
60
+ version: '0'
61
61
  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
62
62
  email: info@elastic.co
63
63
  executables: []
64
64
  extensions: []
65
65
  extra_rdoc_files: []
66
66
  files:
67
- - .gitignore
67
+ - CHANGELOG.md
68
68
  - CONTRIBUTORS
69
69
  - Gemfile
70
70
  - LICENSE
71
+ - NOTICE.TXT
71
72
  - README.md
72
- - Rakefile
73
73
  - lib/logstash/filters/collate.rb
74
74
  - logstash-filter-collate.gemspec
75
75
  - spec/filters/collate_spec.rb
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
95
95
  version: '0'
96
96
  requirements: []
97
97
  rubyforge_project:
98
- rubygems_version: 2.4.5
98
+ rubygems_version: 2.4.8
99
99
  signing_key:
100
100
  specification_version: 4
101
101
  summary: Collate events by time or count
data/.gitignore DELETED
@@ -1,4 +0,0 @@
1
- *.gem
2
- Gemfile.lock
3
- .bundle
4
- vendor
data/Rakefile DELETED
@@ -1,7 +0,0 @@
1
- @files=[]
2
-
3
- task :default do
4
- system("rake -T")
5
- end
6
-
7
- require "logstash/devutils/rake"