logstash-filter-collate 2.0.4 → 2.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f7181265c0002280794b3e582c4baee7fa319832
4
- data.tar.gz: 5eab4c0d691daa871e9a4a4c8a3df203d8d4fd09
3
+ metadata.gz: bbd0595fd0f8e570ba2ae97441c3fd416c2dc540
4
+ data.tar.gz: 63b1f467fef950ade3d10e03054abdbb7ce17750
5
5
  SHA512:
6
- metadata.gz: 7671b269924e73d8022f0fa461454c25a952d70a34f19bbee52e331f411c796972526853d04bf72e9e470cd6285fc5e573697b50ae49752cd217d6f7215bbcf4
7
- data.tar.gz: 76580fda06062d05f4f566e2b65a8f6677e1c48a20f7a25e0787f05a1dba6f4bff45ec368c7522f575a80c765620958ed0316ec834d71bbab078edb70bd088e8
6
+ metadata.gz: 001dafbe595860fda47da8d95d7e9347a640252c3a703f107e99a887cf8878cb6f74995bbf60afbd99a1960c1225be826b4d9686bedbc630ab7cc130355949a6
7
+ data.tar.gz: 95d2d9793561b20d431047586d42b5ff0de9429daa138468ff10a39f3a995854fd43e29d482ba85c9250fefd1fb2a1f6a913c5f309a1f56c72eaee2dc9be06a2
@@ -1,9 +1,11 @@
1
- # 2.0.4
2
- - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
3
- # 2.0.3
4
- - New dependency requirements for logstash-core for the 5.0 release
1
+ ## 2.0.4
2
+ - internal,deps: Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
3
+
4
+ ## 2.0.3
5
+ - internal,deps: New dependency requirements for logstash-core for the 5.0 release
6
+
5
7
  ## 2.0.0
6
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
8
+ - internal: Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
7
9
  instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
8
- - Dependency on logstash-core update to 2.0
10
+ - internal,deps: Dependency on logstash-core update to 2.0
9
11
 
data/Gemfile CHANGED
@@ -1,2 +1,11 @@
1
1
  source 'https://rubygems.org'
2
- gemspec
2
+
3
+ gemspec
4
+
5
+ logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
6
+ use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
7
+
8
+ if Dir.exist?(logstash_path) && use_logstash_source
9
+ gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
10
+ gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
11
+ end
data/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
1
+ Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
2
2
 
3
3
  Licensed under the Apache License, Version 2.0 (the "License");
4
4
  you may not use this file except in compliance with the License.
data/README.md CHANGED
@@ -1,7 +1,6 @@
1
1
  # Logstash Plugin
2
2
 
3
- [![Build
4
- Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-collate-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-collate-unit/)
3
+ [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-collate.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-collate)
5
4
 
6
5
  This is a plugin for [Logstash](https://github.com/elastic/logstash).
7
6
 
@@ -56,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
56
55
  ```
57
56
  - Install plugin
58
57
  ```sh
58
+ # Logstash 2.3 and higher
59
+ bin/logstash-plugin install --no-verify
60
+
61
+ # Prior to Logstash 2.3
59
62
  bin/plugin install --no-verify
63
+
60
64
  ```
61
65
  - Run Logstash with your plugin
62
66
  ```sh
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
74
78
  ```
75
79
  - Install the plugin from the Logstash home
76
80
  ```sh
77
- bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
81
+ # Logstash 2.3 and higher
82
+ bin/logstash-plugin install --no-verify
83
+
84
+ # Prior to Logstash 2.3
85
+ bin/plugin install --no-verify
86
+
78
87
  ```
79
88
  - Start Logstash and proceed to test the plugin
80
89
 
@@ -0,0 +1,84 @@
1
+ :plugin: collate
2
+ :type: filter
3
+
4
+ ///////////////////////////////////////////
5
+ START - GENERATED VARIABLES, DO NOT EDIT!
6
+ ///////////////////////////////////////////
7
+ :version: %VERSION%
8
+ :release_date: %RELEASE_DATE%
9
+ :changelog_url: %CHANGELOG_URL%
10
+ :include_path: ../../../../logstash/docs/include
11
+ ///////////////////////////////////////////
12
+ END - GENERATED VARIABLES, DO NOT EDIT!
13
+ ///////////////////////////////////////////
14
+
15
+ [id="plugins-{type}-{plugin}"]
16
+
17
+ === Collate filter plugin
18
+
19
+ include::{include_path}/plugin_header.asciidoc[]
20
+
21
+ ==== Description
22
+
23
+ Collate events by time or count.
24
+
25
+ The original goal of this filter was to merge the logs from different sources
26
+ by the time of log, for example, in real-time log collection, logs can be
27
+ collated by amount of 3000 logs or can be collated in 30 seconds.
28
+
29
+ The config looks like this:
30
+ [source,ruby]
31
+ filter {
32
+ collate {
33
+ count => 3000
34
+ interval => "30s"
35
+ order => "ascending"
36
+ }
37
+ }
38
+
39
+ [id="plugins-{type}s-{plugin}-options"]
40
+ ==== Collate Filter Configuration Options
41
+
42
+ This plugin supports the following configuration options plus the <<plugins-{type}s-{plugin}-common-options>> described later.
43
+
44
+ [cols="<,<,<",options="header",]
45
+ |=======================================================================
46
+ |Setting |Input type|Required
47
+ | <<plugins-{type}s-{plugin}-count>> |<<number,number>>|No
48
+ | <<plugins-{type}s-{plugin}-interval>> |<<string,string>>|No
49
+ | <<plugins-{type}s-{plugin}-order>> |<<string,string>>, one of `["ascending", "descending"]`|No
50
+ |=======================================================================
51
+
52
+ Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
53
+ filter plugins.
54
+
55
+ &nbsp;
56
+
57
+ [id="plugins-{type}s-{plugin}-count"]
58
+ ===== `count`
59
+
60
+ * Value type is <<number,number>>
61
+ * Default value is `1000`
62
+
63
+ How many logs should be collated.
64
+
65
+ [id="plugins-{type}s-{plugin}-interval"]
66
+ ===== `interval`
67
+
68
+ * Value type is <<string,string>>
69
+ * Default value is `"1m"`
70
+
71
+ The `interval` is the time window which how long the logs should be collated. (default `1m`)
72
+
73
+ [id="plugins-{type}s-{plugin}-order"]
74
+ ===== `order`
75
+
76
+ * Value can be any of: `ascending`, `descending`
77
+ * Default value is `"ascending"`
78
+
79
+ The `order` collated events should appear in.
80
+
81
+
82
+
83
+ [id="plugins-{type}s-{plugin}-common-options"]
84
+ include::{include_path}/{type}.asciidoc[]
@@ -13,7 +13,7 @@ require "logstash/namespace"
13
13
  # [source,ruby]
14
14
  # filter {
15
15
  # collate {
16
- # size => 3000
16
+ # count => 3000
17
17
  # interval => "30s"
18
18
  # order => "ascending"
19
19
  # }
@@ -1,17 +1,17 @@
1
1
  Gem::Specification.new do |s|
2
2
 
3
3
  s.name = 'logstash-filter-collate'
4
- s.version = '2.0.4'
4
+ s.version = '2.0.5'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "Collate events by time or count"
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"
7
+ s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
8
8
  s.authors = ["Elastic"]
9
9
  s.email = 'info@elastic.co'
10
10
  s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
11
11
  s.require_paths = ["lib"]
12
12
 
13
13
  # Files
14
- s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
14
+ s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
15
15
 
16
16
  # Tests
17
17
  s.test_files = s.files.grep(%r{^(test|spec|features)/})
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-filter-collate
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-24 00:00:00.000000000 Z
11
+ date: 2017-06-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
- 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
55
+ description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
56
56
  email: info@elastic.co
57
57
  executables: []
58
58
  extensions: []
@@ -64,6 +64,7 @@ files:
64
64
  - LICENSE
65
65
  - NOTICE.TXT
66
66
  - README.md
67
+ - docs/index.asciidoc
67
68
  - lib/logstash/filters/collate.rb
68
69
  - logstash-filter-collate.gemspec
69
70
  - spec/filters/collate_spec.rb