logstash-filter-aggregate 0.1.5 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1149eb1e70a66aea89d164eb8046e14e5b51d3e
-  data.tar.gz: bdbb0e9df1f525de4548b1ab78b3c132d28b87b1
+  metadata.gz: 54c0279cf7984071cc3f9a16b46c6880381ce1c8
+  data.tar.gz: 4388fcf687de2dbdc244567faf9b377d1078c639
 SHA512:
-  metadata.gz: 307eb7baf8d3be19b0fd3e7d28243c79b73a1b2a4b938be66365833156a2e676747ea867c4d79e4c9720bca6af35cecfde41a69206366c369133cb79a5722e66
-  data.tar.gz: 7f0a13541acf445ff46c74d8ed214901eb7d1d7de9d67be18f26612d4f9c88088aa18eb4d056063a7284067fdf775417c02e62a84673b4bacfe567f5700ba632
+  metadata.gz: 7c1fea00dea5fce67dc57e5f24d402d116f966c4412e714b9ac385a2189a0b3284b3674c5d941fd4120a969e90dd562f2859884e26444be5885e85cf6725c651
+  data.tar.gz: 1769add45737af42642d49cc762a93499df95e6c766c4e82ec03ed7978fa7535c81daf10b91ce96943286238b72e6faad3c65596075e4cfbc9bdab8eadb97d2e

data/BUILD.md

@@ -1,82 +1,82 @@
-# Logstash Plugin
-
-This is a plugin for [Logstash](https://github.com/elastic/logstash).
-
-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.
-
-## Documentation
-
-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/).
-
-- For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
-
-## Developing
-
-### 1. Plugin Developement and Testing
-
-#### Code
-- To get started, you'll need JRuby with the Bundler gem installed.
-
-- Create a new plugin or clone an existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
-
-- Install dependencies
-```sh
-bundle install
-```
-
-#### Test
-
-- Update your dependencies
-
-```sh
-bundle install
-```
-
-- Run tests
-
-```sh
-bundle exec rspec
-```
-
-### 2. Running your unpublished Plugin in Logstash
-
-#### 2.1 Run in a local Logstash clone
-
-- Edit Logstash `Gemfile` and add the local plugin path, for example:
-```ruby
-gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
-```
-- Install plugin
-```sh
-bin/plugin install --no-verify
-```
-- Run Logstash with your plugin
-```sh
-bin/logstash -e 'filter {awesome {}}'
-```
-At this point any modifications to the plugin code will be applied to this local Logstash setup. After modifying the plugin, simply rerun Logstash.
-
-#### 2.2 Run in an installed Logstash
-
-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:
-
-- Build your plugin gem
-```sh
-gem build logstash-filter-awesome.gemspec
-```
-- Install the plugin from the Logstash home
-```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
-```
-- Start Logstash and proceed to test the plugin
-
-## Contributing
-
-All contributions are welcome: ideas, patches, documentation, bug reports, complaints, and even something you drew up on a napkin.
-
-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.
-
-It is more important to the community that you are able to contribute.
-
+# Logstash Plugin
+
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
+
+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.
+
+## Documentation
+
+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/).
+
+- For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
+
+## Developing
+
+### 1. Plugin Developement and Testing
+
+#### Code
+- To get started, you'll need JRuby with the Bundler gem installed.
+
+- Create a new plugin or clone an existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
+
+- Install dependencies
+```sh
+bundle install
+```
+
+#### Test
+
+- Update your dependencies
+
+```sh
+bundle install
+```
+
+- Run tests
+
+```sh
+bundle exec rspec
+```
+
+### 2. Running your unpublished Plugin in Logstash
+
+#### 2.1 Run in a local Logstash clone
+
+- Edit Logstash `Gemfile` and add the local plugin path, for example:
+```ruby
+gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
+```
+- Install plugin
+```sh
+bin/plugin install --no-verify
+```
+- Run Logstash with your plugin
+```sh
+bin/logstash -e 'filter {awesome {}}'
+```
+At this point any modifications to the plugin code will be applied to this local Logstash setup. After modifying the plugin, simply rerun Logstash.
+
+#### 2.2 Run in an installed Logstash
+
+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:
+
+- Build your plugin gem
+```sh
+gem build logstash-filter-awesome.gemspec
+```
+- Install the plugin from the Logstash home
+```sh
+bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+```
+- Start Logstash and proceed to test the plugin
+
+## Contributing
+
+All contributions are welcome: ideas, patches, documentation, bug reports, complaints, and even something you drew up on a napkin.
+
+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.
+
+It is more important to the community that you are able to contribute.
+
 For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/CHANGELOG.md

@@ -1,15 +1,14 @@
-# v 0.1.5
-- fix issue #10 : numeric task_id is now well processed
-
-# v 0.1.4
-- fix issue #5 : when code call raises an exception, the error is logged and the event is tagged '_aggregateexception'. It avoids logstash crash.
-
-# v 0.1.3
-- break compatibility with logstash 1.4
-- remove "milestone" method call which is deprecated in logstash 1.5
-- enhanced tests using 'expect' command
-- add a second example in documentation
-
-# v 0.1.2
-- compatible with logstash 1.4
-- first version available on github
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+
+# v 0.1.3
+- break compatibility with logstash 1.4
+- remove "milestone" method call which is deprecated in logstash 1.5
+- enhanced tests using 'expect' command
+- add a second example in documentation
+
+# v 0.1.2
+- compatible with logstash 1.4
+- first version available on github

data/CONTRIBUTORS

@@ -1,10 +1,10 @@
-The following is a list of people who have contributed ideas, code, bug
-reports, or in general have helped logstash along its way.
-
-Contributors:
-* Fabien Baligand (fbaligand)
-
-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.
+The following is a list of people who have contributed ideas, code, bug
+reports, or in general have helped logstash along its way.
+
+Contributors:
+* Fabien Baligand (fbaligand)
+
+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.

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
-gemspec
+source 'https://rubygems.org'
+gemspec

data/LICENSE

@@ -1,13 +1,13 @@
-Copyright (c) 2012-2015 Elasticsearch <http://www.elasticsearch.org>
-
-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.
+Copyright (c) 2012-2015 Elasticsearch <http://www.elasticsearch.org>
+
+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.

data/README.md

@@ -1,147 +1,147 @@
-# Logstash Filter Aggregate Documentation
-
-The aim of this filter is to aggregate information available among several events (typically log lines) belonging to a same task, and finally push aggregated information into final task event.
- 
-## Example #1
-
-* with these given logs : 
-```
-     INFO - 12345 - TASK_START - start
-     INFO - 12345 - SQL - sqlQuery1 - 12
-     INFO - 12345 - SQL - sqlQuery2 - 34
-     INFO - 12345 - TASK_END - end
-```
-
-* you can aggregate "sql duration" for the whole task with this configuration : 
-``` ruby
-     filter {
-         grok {
-             match => [ "message", "%{LOGLEVEL:loglevel} - %{NOTSPACE:taskid} - %{NOTSPACE:logger} - %{WORD:label}( - %{INT:duration:int})?" ]
-         }
-     
-         if [logger] == "TASK_START" {
-             aggregate {
-                 task_id => "%{taskid}"
-                 code => "map['sql_duration'] = 0"
-                 map_action => "create"
-             }
-         }
-     
-         if [logger] == "SQL" {
-             aggregate {
-                 task_id => "%{taskid}"
-                 code => "map['sql_duration'] += event['duration']"
-                 map_action => "update"
-             }
-         }
-     
-         if [logger] == "TASK_END" {
-             aggregate {
-                 task_id => "%{taskid}"
-                 code => "event['sql_duration'] = map['sql_duration']"
-                 map_action => "update"
-                 end_of_task => true
-                 timeout => 120
-             }
-         }
-     }
-```
-
-* the final event then looks like :
-``` ruby
-{
-         "message" => "INFO - 12345 - TASK_END - end",
-    "sql_duration" => 46
-}
-```
-
-the field `sql_duration` is added and contains the sum of all sql queries durations.
-
-## Example #2
-
-* If you have the same logs than example #1, but without a start log : 
-```
-     INFO - 12345 - SQL - sqlQuery1 - 12
-     INFO - 12345 - SQL - sqlQuery2 - 34
-     INFO - 12345 - TASK_END - end
-```
-
-* you can also aggregate "sql duration" with a slightly different configuration : 
-``` ruby
-     filter {
-         grok {
-             match => [ "message", "%{LOGLEVEL:loglevel} - %{NOTSPACE:taskid} - %{NOTSPACE:logger} - %{WORD:label}( - %{INT:duration:int})?" ]
-         }
-     
-         if [logger] == "SQL" {
-             aggregate {
-                 task_id => "%{taskid}"
-                 code => "map['sql_duration'] ||= 0 ; map['sql_duration'] += event['duration']"
-             }
-         }
-     
-         if [logger] == "TASK_END" {
-             aggregate {
-                 task_id => "%{taskid}"
-                 code => "event['sql_duration'] = map['sql_duration']"
-                 end_of_task => true
-                 timeout => 120
-             }
-         }
-     }
-```
-
-* the final event is exactly the same than example #1
-* the key point is the "||=" ruby operator.  
-it allows to initialize 'sql_duration' map entry to 0 only if this map entry is not already initialized
-
-
-## How it works
-- the filter needs a "task_id" to correlate events (log lines) of a same task
-- at the task beggining, filter creates a map, attached to task_id
-- for each event, you can execute code using 'event' and 'map' (for instance, copy an event field to map)
-- in the final event, you can execute a last code (for instance, add map data to final event)
-- after the final event, the map attached to task is deleted
-- in one filter configuration, it is recommanded to define a timeout option to protect the filter against unterminated tasks. It tells the filter to delete expired maps
-- if no timeout is defined, by default, all maps older than 1800 seconds are automatically deleted
-- finally, if `code` execution raises an exception, the error is logged and event is tagged '_aggregateexception'
-
-## Aggregate Plugin Options
-- **task_id :**  
-The expression defining task ID to correlate logs.  
-This value must uniquely identify the task in the system.  
-This option is required.  
-Example value : `"%{application}%{my_task_id}"`  
-
-- **code:**  
-The code to execute to update map, using current event.  
-Or on the contrary, the code to execute to update event, using current map.  
-You will have a 'map' variable and an 'event' variable available (that is the event itself).  
-This option is required.  
-Example value : `"map['sql_duration'] += event['duration']"`  
-
-- **map_action:**  
-Tell the filter what to do with aggregate map (default :  "create_or_update").  
-`create`: create the map, and execute the code only if map wasn't created before  
-`update`: doesn't create the map, and execute the code only if map was created before  
-`create_or_update`: create the map if it wasn't created before, execute the code in all cases  
-Default value: `create_or_update`  
-
-- **end_of_task:**  
-Tell the filter that task is ended, and therefore, to delete map after code execution.  
-Default value: `false`  
-
-- **timeout:**  
-The amount of seconds after a task "end event" can be considered lost.  
-The task "map" is then evicted.  
-The default value is 0, which means no timeout so no auto eviction.  
-
-
-## Need Help?
-
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
-
-
-## Want to contribute?
-
-Read [BUILD.md](BUILD.md).
+# Logstash Filter Aggregate Documentation
+
+The aim of this filter is to aggregate information available among several events (typically log lines) belonging to a same task, and finally push aggregated information into final task event.
+ 
+## Example #1
+
+* with these given logs : 
+```
+     INFO - 12345 - TASK_START - start
+     INFO - 12345 - SQL - sqlQuery1 - 12
+     INFO - 12345 - SQL - sqlQuery2 - 34
+     INFO - 12345 - TASK_END - end
+```
+
+* you can aggregate "sql duration" for the whole task with this configuration : 
+``` ruby
+     filter {
+         grok {
+             match => [ "message", "%{LOGLEVEL:loglevel} - %{NOTSPACE:taskid} - %{NOTSPACE:logger} - %{WORD:label}( - %{INT:duration:int})?" ]
+         }
+     
+         if [logger] == "TASK_START" {
+             aggregate {
+                 task_id => "%{taskid}"
+                 code => "map['sql_duration'] = 0"
+                 map_action => "create"
+             }
+         }
+     
+         if [logger] == "SQL" {
+             aggregate {
+                 task_id => "%{taskid}"
+                 code => "map['sql_duration'] += event['duration']"
+                 map_action => "update"
+             }
+         }
+     
+         if [logger] == "TASK_END" {
+             aggregate {
+                 task_id => "%{taskid}"
+                 code => "event['sql_duration'] = map['sql_duration']"
+                 map_action => "update"
+                 end_of_task => true
+                 timeout => 120
+             }
+         }
+     }
+```
+
+* the final event then looks like :
+``` ruby
+{
+         "message" => "INFO - 12345 - TASK_END - end",
+    "sql_duration" => 46
+}
+```
+
+the field `sql_duration` is added and contains the sum of all sql queries durations.
+
+## Example #2
+
+* If you have the same logs than example #1, but without a start log : 
+```
+     INFO - 12345 - SQL - sqlQuery1 - 12
+     INFO - 12345 - SQL - sqlQuery2 - 34
+     INFO - 12345 - TASK_END - end
+```
+
+* you can also aggregate "sql duration" with a slightly different configuration : 
+``` ruby
+     filter {
+         grok {
+             match => [ "message", "%{LOGLEVEL:loglevel} - %{NOTSPACE:taskid} - %{NOTSPACE:logger} - %{WORD:label}( - %{INT:duration:int})?" ]
+         }
+     
+         if [logger] == "SQL" {
+             aggregate {
+                 task_id => "%{taskid}"
+                 code => "map['sql_duration'] ||= 0 ; map['sql_duration'] += event['duration']"
+             }
+         }
+     
+         if [logger] == "TASK_END" {
+             aggregate {
+                 task_id => "%{taskid}"
+                 code => "event['sql_duration'] = map['sql_duration']"
+                 end_of_task => true
+                 timeout => 120
+             }
+         }
+     }
+```
+
+* the final event is exactly the same than example #1
+* the key point is the "||=" ruby operator.  
+it allows to initialize 'sql_duration' map entry to 0 only if this map entry is not already initialized
+
+
+## How it works
+- the filter needs a "task_id" to correlate events (log lines) of a same task
+- at the task beggining, filter creates a map, attached to task_id
+- for each event, you can execute code using 'event' and 'map' (for instance, copy an event field to map)
+- in the final event, you can execute a last code (for instance, add map data to final event)
+- after the final event, the map attached to task is deleted
+- in one filter configuration, it is recommanded to define a timeout option to protect the filter against unterminated tasks. It tells the filter to delete expired maps
+- if no timeout is defined, by default, all maps older than 1800 seconds are automatically deleted
+- finally, if `code` execution raises an exception, the error is logged and event is tagged '_aggregateexception'
+
+## Aggregate Plugin Options
+- **task_id :**  
+The expression defining task ID to correlate logs.  
+This value must uniquely identify the task in the system.  
+This option is required.  
+Example value : `"%{application}%{my_task_id}"`  
+
+- **code:**  
+The code to execute to update map, using current event.  
+Or on the contrary, the code to execute to update event, using current map.  
+You will have a 'map' variable and an 'event' variable available (that is the event itself).  
+This option is required.  
+Example value : `"map['sql_duration'] += event['duration']"`  
+
+- **map_action:**  
+Tell the filter what to do with aggregate map (default :  "create_or_update").  
+`create`: create the map, and execute the code only if map wasn't created before  
+`update`: doesn't create the map, and execute the code only if map was created before  
+`create_or_update`: create the map if it wasn't created before, execute the code in all cases  
+Default value: `create_or_update`  
+
+- **end_of_task:**  
+Tell the filter that task is ended, and therefore, to delete map after code execution.  
+Default value: `false`  
+
+- **timeout:**  
+The amount of seconds after a task "end event" can be considered lost.  
+The task "map" is then evicted.  
+The default value is 0, which means no timeout so no auto eviction.  
+
+
+## Need Help?
+
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
+
+
+## Want to contribute?
+
+Read [BUILD.md](BUILD.md).