logstash-filter-duration 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185427ecadb15b4cf23a17e71f3375177735bbce
-  data.tar.gz: c871c9ee0ff0b8061fb0fe893bd04f3556dc73b8
+  metadata.gz: ab55a4ea7b39341646e72f66d37652be2a9201c2
+  data.tar.gz: 7caa0ee795fa4aed277efc0ecef9db61975749aa
 SHA512:
-  metadata.gz: 324a1f7c112cf4816771de866572d14267c561fc2303e45298031bb571908341a0fdcacb4207994f2ea459686f2d3e51dad3ac5ed37f78a9f005cf01f975a87e
-  data.tar.gz: 53b93592e9d100bad34e9249a1f0f2a774d22c38d48517ff1c3b6f99ca31b2324aba87635c722e66ba4841309c67a736a1588523b4a587884c1ae126c1dbd4a7
+  metadata.gz: 8c834aade409026f1c7521afff4d8f1223cc75f655fee179e9f5183e84cfba1488609130ca8f76364165a7710472e12dd4b7723f894eabca3a12335a397db3b5
+  data.tar.gz: 3687f4919d6262d6b8f53961724e7702fe364c68c221ee79ca6412c5d185114c3d623aae47143d726cb38d1819b7ba4077042c0ac4d4173a00fce504f279b605

data/README.md

@@ -1,98 +1,18 @@
-# Logstash Plugin
+# Logstash Duration Filter
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-example.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-example)
+[![Travis Build Status](https://travis-ci.org/funkwerk/logstash-filter-duration.svg)](https://travis-ci.org/funkwerk/logstash-filter-duration)
 
 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.
+## Usage
 
-## 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.elastic.co/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
-
-## Need Help?
-
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
-
-## 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 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).
-
-- 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
-# Logstash 2.3 and higher
-bin/logstash-plugin install --no-verify
-
-# Prior to Logstash 2.3
-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
+grok {
+  match => {'message' => 'delay=(?<delay>.*)'}
+}
+if [delay] {
+  duration {
+    iso => 'delay'
+  }
+}
 ```
-- Install the plugin from the Logstash home
-```sh
-# Logstash 2.3 and higher
-bin/logstash-plugin install --no-verify
-
-# Prior to Logstash 2.3
-bin/plugin install --no-verify
-
-```
-- 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/lib/logstash/filters/duration.rb

@@ -1,47 +1,45 @@
 # encoding: utf-8
-require "logstash/filters/base"
-require "logstash/namespace"
+require 'logstash/filters/base'
+require 'logstash/namespace'
 
 class LogStash::Filters::Duration < LogStash::Filters::Base
 
-  config_name "duration"
+  config_name 'duration'
 
-  config :iso, :validate => :string, :default => "", :required => true
+  config :iso, :validate => :string, :default => '', :required => true
 
   public
   def register
-  end # def register
+  end
 
   public
   def filter(event)
-    if @iso
-      value = event.get(@iso)
-      if not valid(value)
-        return event.set("duration", 0)
-      end
-      days = value[/([0-9]+)D/, 1].to_i
-      hours = value[/([0-9]+)H/, 1].to_i
-      minutes = value[/([0-9]+)M/, 1].to_i
-      seconds = value[/([0-9]+)S/, 1].to_i
-      duration = total_seconds(days, hours, minutes, seconds)
-      if value[/^-/]
-        duration *= -1
-      end
-
-      event.set("duration", duration)
-    end
-
+    return unless @iso
+    event.set('duration', parse(event.get(@iso)))
     filter_matched(event)
-  end # def filter
+  end
 
-  private
-  def total_seconds(days=0, hours=0, minutes=0, seconds=0)
-    seconds + 60 * (minutes + 60 * (hours + 24 * days))
-  end # def total_seconds
+  def parse(value)
+    match = match_pattern value
+    return 0 if match.nil?
+
+    duration = total_seconds(
+      match[:days].to_i,
+      match[:hours].to_i,
+      match[:minutes].to_i,
+      match[:seconds].to_i
+    )
+    duration = -duration if match[:negate] == '-'
+    duration
+  end
+
+  def match_pattern(value)
+    pattern = /^(?<negate>-)?P((?<days>\d+)D)?(T((?<hours>\d+)H)?((?<minutes>\d+)M)?((?<seconds>\d+)(.(?<milliseconds>\d+))?S)?)?$/
 
-  private
-  def valid(value)
-    value[/^(-)?(P([0-9]+D)+(T([0-9]+H)?([0-9]+M)?([0-9]+S)?([0-9]+MS)?)?$|P([0-9]+D)?(T([0-9]+H)?([0-9]+M)?([0-9]+S)?([0-9]+MS)?)+$)/]
+    value.match pattern
   end
 
-end # class LogStash::Filters::Duration
+  def total_seconds(days, hours, minutes, seconds)
+    seconds + 60 * (minutes + 60 * (hours + 24 * days))
+  end
+end

data/logstash-filter-duration.gemspec

@@ -1,21 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-duration'
-  s.version         = '0.1.1'
-  s.licenses = ['Apache License (2.0)']
-  s.summary = "This filter parses duration in ISO format."
-  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"
-  s.authors = ["Funkwerk AG"]
-  s.require_paths = ["lib"]
+  s.version = '0.2.0'
+  s.licenses = ['Apache License 2.0']
+  s.summary = 'This filter parses ISO durations and converts it into seconds.'
+  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'
+  s.authors = ['Funkwerk AG']
+  s.require_paths = ['lib']
   s.homepage = 'https://github.com/funkwerk/logstash-duration-filter/'
-
-  # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
-   # Tests
+  s.files = Dir['lib/**/*', 'spec/**/*', '*.gemspec', '*.md', 'Gemfile']
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
-
-  # Special flag to let us know this is actually a logstash plugin
-  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
-
-  # Gem dependencies
+  s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => 'filter' }
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/filters/duration_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 require 'spec_helper'
-require "logstash/filters/duration"
+require 'logstash/filters/duration'
 
 describe LogStash::Filters::Duration do
-  describe "Parse duration in ISO format" do
+  describe 'Parse duration in ISO format' do
     let(:config) do <<-CONFIG
       filter {
         duration {
@@ -13,32 +13,32 @@ describe LogStash::Filters::Duration do
     CONFIG
     end
 
-    sample('iso' => "PT1H2M3S") do
-      expect(subject.get("duration")).to eq(total_seconds(days=0, hours=1, minutes=2, seconds=3))
+    sample('iso' => 'P1D') do
+      expect(subject.get('duration')).to eq(total_seconds(days: 1))
     end
 
-    sample('iso' => "PT1H2M3S1000MS") do
-      expect(subject.get("duration")).to eq(total_seconds(days=0, hours=1, minutes=2, seconds=3))
+    sample('iso' => 'PT1H') do
+      expect(subject.get('duration')).to eq(total_seconds(hours: 1))
     end
 
-    sample('iso' => "-PT1H2M3S") do
-      expect(subject.get("duration")).to eq(-total_seconds(days=0, hours=1, minutes=2, seconds=3))
+    sample('iso' => 'PT1M') do
+      expect(subject.get('duration')).to eq(total_seconds(minutes: 1))
     end
 
-    sample('iso' => "P1D") do
-      expect(subject.get("duration")).to eq(total_seconds(days=1))
+    sample('iso' => 'PT1S') do
+      expect(subject.get('duration')).to eq(total_seconds(seconds: 1))
     end
 
-    sample('iso' => "P1DT2H3M4S") do
-      expect(subject.get("duration")).to eq(total_seconds(days=1, hours=2, minutes=3, seconds=4))
+    sample('iso' => 'PT1.2S') do
+      expect(subject.get('duration')).to eq(total_seconds(seconds: 1))
     end
 
-    sample('iso' => "P1M") do
-      expect(subject.get("duration")).to eq(total_seconds())
+    sample('iso' => 'P1DT2H3M4S') do
+      expect(subject.get('duration')).to eq(total_seconds(days: 1, hours: 2, minutes: 3, seconds: 4))
     end
 
-    sample('iso' => "PT2M1H3S") do
-      expect(subject.get("duration")).to eq(total_seconds())
+    sample('iso' => '-P1DT2H3M4S') do
+      expect(subject.get('duration')).to eq(-total_seconds(days: 1, hours: 2, minutes: 3, seconds: 4))
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
 
-def total_seconds(days=0, hours=0, minutes=0, seconds=0)
-  seconds + 60 * (minutes + 60 * (hours + 24 * days))
-end # def total_seconds
+def total_seconds(duration = {})
+  duration[:days] ||= 0
+  duration[:hours] ||= 0
+  duration[:minutes] ||= 0
+  duration[:seconds] ||= 0
+
+  duration[:seconds] + 60 * (duration[:minutes] + 60 * (duration[:hours] + 24 * duration[:days]))
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-duration
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Funkwerk AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
@@ -32,12 +32,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- CONTRIBUTORS
-- DEVELOPER.md
 - Gemfile
-- LICENSE
-- NOTICE.TXT
 - README.md
 - lib/logstash/filters/duration.rb
 - logstash-filter-duration.gemspec
@@ -45,7 +40,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/funkwerk/logstash-duration-filter/
 licenses:
-- Apache License (2.0)
+- Apache License 2.0
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
@@ -68,7 +63,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: This filter parses duration in ISO format.
+summary: This filter parses ISO durations and converts it into seconds.
 test_files:
 - spec/filters/duration_spec.rb
 - spec/spec_helper.rb

data/CHANGELOG.md

@@ -1,5 +0,0 @@
-## 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
-

data/CONTRIBUTORS

@@ -1,11 +0,0 @@
-The following is a list of people who have contributed ideas, code, bug
-reports, or in general have helped logstash along its way.
-
-Contributors:
-* Aaron Mildenstein (untergeek)
-* Pier-Hugues Pellerin (ph)
-
-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/DEVELOPER.md

@@ -1,2 +0,0 @@
-# logstash-filter-example
-Example filter plugin. This should help bootstrap your effort to write your own filter plugin!

data/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
-
-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/NOTICE.TXT

@@ -1,5 +0,0 @@
-Elasticsearch
-Copyright 2012-2015 Elasticsearch
-
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).