logstash-filter-elapsed 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4627cc1a4e6348394f82170fa0936280226e8a4
-  data.tar.gz: 3ae065d888a13ed11446723e3e11989f788fb3fe
+  metadata.gz: 6892219b404e96411216707b1bb17cf60884dd65
+  data.tar.gz: d61cb14d8de18190aff53baebc8acb993a322cfc
 SHA512:
-  metadata.gz: 6bf11487ff0921e5fae2bd3adab819eba5560d9281f30c4ffc08f9deadd7e9c657839e594ea7cc6feb03bda86d3909057d91713a09bfea049120bd26368dcb4e
-  data.tar.gz: c293db5e6ef3adfc1f05638a99108a7bf60d06430592e209403ff7b61a4c7b1bc9ad8b206f637921887f9f094a2b4a5279174a171c957c2396fb1184cb8d675e
+  metadata.gz: 5a9d450ea54de03a47264f6f7703b28456166a12060a1709c1f15132df076840b346ae169fb76e0377f5649e6f58317524edeef750052b6f3da1a359981de9a8
+  data.tar.gz: fec56248a3ce501791129f5565ba3e338f5140423cecb62d25a24e17b5c020bd725ba00f7ac3d6158dadadc01e02f7a0d3a7e7160c416eae45e8972511af12f4

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+# 4.0.0
+  - Use the new Event Api used in v5.0.0+
+
 # 3.0.2
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+
 # 3.0.1
   - New dependency requirements for logstash-core for the 5.0 release
+
 ## 3.0.0
  - Elasticsearch 2.0 does not allow field names with dots in them.  This is a
    breaking change which replaces the `.` with an underscore, `_`

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+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.

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-elapsed-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-elapsed-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-elapsed.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-elapsed)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,7 +55,12 @@ 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
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# 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
 

data/lib/logstash/filters/elapsed.rb

@@ -39,13 +39,13 @@ require 'socket'
 # [source,ruby]
 #     filter {
 #       grok {
-#         match => ["message", "%{TIMESTAMP_ISO8601} START id: (?<task_id>.*)"]
+#         match => { "message" => "%{TIMESTAMP_ISO8601} START id: (?<task_id>.*)" }
 #         add_tag => [ "taskStarted" ]
 #       }
 #
 #       grok {
-#         match => ["message", "%{TIMESTAMP_ISO8601} END id: (?<task_id>.*)"]
-#         add_tag => [ "taskTerminated"]
+#         match => { "message" => "%{TIMESTAMP_ISO8601} END id: (?<task_id>.*)" }
+#         add_tag => [ "taskTerminated" ]
 #       }
 #
 #       elapsed {
@@ -133,7 +133,7 @@ class LogStash::Filters::Elapsed < LogStash::Filters::Base
   def filter(event)
 
 
-    unique_id = event[@unique_id_field]
+    unique_id = event.get(@unique_id_field)
     return if unique_id.nil?
 
     if(start_event?(event))
@@ -154,13 +154,13 @@ class LogStash::Filters::Elapsed < LogStash::Filters::Base
       if(@start_events.has_key?(unique_id))
         start_event = @start_events.delete(unique_id).event
         @mutex.unlock
-        elapsed = event["@timestamp"] - start_event["@timestamp"]
+        elapsed = event.get("@timestamp") - start_event.get("@timestamp")
         if(@new_event_on_match)
-          elapsed_event = new_elapsed_event(elapsed, unique_id, start_event["@timestamp"])
+          elapsed_event = new_elapsed_event(elapsed, unique_id, start_event.get("@timestamp"))
           filter_matched(elapsed_event)
           yield elapsed_event if block_given?
         else
-          return add_elapsed_info(event, elapsed, unique_id, start_event["@timestamp"])
+          return add_elapsed_info(event, elapsed, unique_id, start_event.get("@timestamp"))
         end
       else
         @mutex.unlock
@@ -211,10 +211,10 @@ class LogStash::Filters::Elapsed < LogStash::Filters::Base
       error_event.tag(ELAPSED_TAG)
       error_event.tag(EXPIRED_ERROR_TAG)
 
-      error_event[HOST_FIELD] = Socket.gethostname
-      error_event[@unique_id_field] = element.event[@unique_id_field]
-      error_event[ELAPSED_FIELD] = element.age
-      error_event[TIMESTAMP_START_EVENT_FIELD] = element.event["@timestamp"]
+      error_event.set(HOST_FIELD, Socket.gethostname)
+      error_event.set(@unique_id_field, element.event.get(@unique_id_field) )
+      error_event.set(ELAPSED_FIELD, element.age)
+      error_event.set(TIMESTAMP_START_EVENT_FIELD, element.event.get("@timestamp") )
 
       events << error_event
       filter_matched(error_event)
@@ -224,16 +224,16 @@ class LogStash::Filters::Elapsed < LogStash::Filters::Base
   end
 
   def start_event?(event)
-    return (event["tags"] != nil && event["tags"].include?(@start_tag))
+    return (event.get("tags") != nil && event.get("tags").include?(@start_tag))
   end
 
   def end_event?(event)
-    return (event["tags"] != nil && event["tags"].include?(@end_tag))
+    return (event.get("tags") != nil && event.get("tags").include?(@end_tag))
   end
 
   def new_elapsed_event(elapsed_time, unique_id, timestamp_start_event)
       new_event = LogStash::Event.new
-      new_event[HOST_FIELD] = Socket.gethostname
+      new_event.set(HOST_FIELD, Socket.gethostname)
       return add_elapsed_info(new_event, elapsed_time, unique_id, timestamp_start_event)
   end
 
@@ -241,9 +241,9 @@ class LogStash::Filters::Elapsed < LogStash::Filters::Base
       event.tag(ELAPSED_TAG)
       event.tag(MATCH_TAG)
 
-      event[ELAPSED_FIELD] = elapsed_time
-      event[@unique_id_field] = unique_id
-      event[TIMESTAMP_START_EVENT_FIELD] = timestamp_start_event
+      event.set(ELAPSED_FIELD, elapsed_time)
+      event.set(@unique_id_field, unique_id)
+      event.set(TIMESTAMP_START_EVENT_FIELD, timestamp_start_event)
 
       return event
   end

data/logstash-filter-elapsed.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-elapsed'
-  s.version         = '3.0.2'
+  s.version         = '4.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This filter tracks a pair of start/end events and calculates the elapsed time between them."
-  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"
+  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         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/filters/elapsed_spec.rb

@@ -105,7 +105,7 @@ describe LogStash::Filters::Elapsed do
 
             @filter.filter(end_event)
 
-            insist { end_event["tags"].include?("elapsed_end_without_start") } == true
+            insist { end_event.get("tags").include?("elapsed_end_without_start") } == true
           end
         end
       end
@@ -150,23 +150,23 @@ describe LogStash::Filters::Elapsed do
 
           shared_examples_for "match event" do
             it "contains the tag 'elapsed'" do
-              insist { @match_event["tags"].include?("elapsed") } == true
+              insist { @match_event.get("tags").include?("elapsed") } == true
             end
 
             it "contains the tag tag 'elapsed_match'" do
-              insist { @match_event["tags"].include?("elapsed_match") } == true
+              insist { @match_event.get("tags").include?("elapsed_match") } == true
             end
 
             it "contains an 'elapsed_time field' with the elapsed time" do
-              insist { @match_event["elapsed_time"] } == 10
+              insist { @match_event.get("elapsed_time") } == 10
             end
 
             it "contains an 'elapsed_timestamp_start field' with the timestamp of the 'start event'" do
-              insist { @match_event["elapsed_timestamp_start"] } == @start_event["@timestamp"]
+              insist { @match_event.get("elapsed_timestamp_start") } == @start_event.get("@timestamp")
             end
 
             it "contains an 'id field'" do
-              insist { @match_event[ID_FIELD] } == @id_value
+              insist { @match_event.get(ID_FIELD) } == @id_value
             end
           end
 
@@ -178,7 +178,7 @@ describe LogStash::Filters::Elapsed do
               @start_event = start_event(ID_FIELD => @id_value)
               @filter.filter(@start_event)
 
-              end_timestamp = @start_event["@timestamp"] + 10
+              end_timestamp = @start_event.get("@timestamp") + 10
               end_event = end_event(ID_FIELD => @id_value, "@timestamp" => end_timestamp)
               @filter.filter(end_event) do |new_event|
                 @match_event = new_event
@@ -189,14 +189,14 @@ describe LogStash::Filters::Elapsed do
               it_behaves_like "match event"
 
               it "contains the 'host field'" do
-                insist { @match_event["host"] } == Socket.gethostname
+                insist { @match_event.get("host") } == Socket.gethostname
               end
             end
           end
 
           context "if 'new_event_on_match' is set to 'false'" do
             before(:each) do
-              end_timestamp = @start_event["@timestamp"] + 10
+              end_timestamp = @start_event.get("@timestamp") + 10
               end_event = end_event(ID_FIELD => @id_value, "@timestamp" => end_timestamp)
               @filter.filter(end_event)
 
@@ -264,33 +264,33 @@ describe LogStash::Filters::Elapsed do
       end
 
       it "creates a new event with tag 'elapsed_expired_error' for each expired 'start event'" do
-        insist { @expired_events[0]["tags"].include?("elapsed_expired_error") } == true
-        insist { @expired_events[1]["tags"].include?("elapsed_expired_error") } == true
+        insist { @expired_events[0].get("tags").include?("elapsed_expired_error") } == true
+        insist { @expired_events[1].get("tags").include?("elapsed_expired_error") } == true
       end
 
       it "creates a new event with tag 'elapsed' for each expired 'start event'" do
-        insist { @expired_events[0]["tags"].include?("elapsed") } == true
-        insist { @expired_events[1]["tags"].include?("elapsed") } == true
+        insist { @expired_events[0].get("tags").include?("elapsed") } == true
+        insist { @expired_events[1].get("tags").include?("elapsed") } == true
       end
 
       it "creates a new event containing the 'id field' of the expired 'start event'" do
-        insist { @expired_events[0][ID_FIELD] } == "2"
-        insist { @expired_events[1][ID_FIELD] } == "3"
+        insist { @expired_events[0].get(ID_FIELD) } == "2"
+        insist { @expired_events[1].get(ID_FIELD) } == "3"
       end
 
       it "creates a new event containing an 'elapsed_time field' with the age of the expired 'start event'" do
-        insist { @expired_events[0]["elapsed_time"] } == 30
-        insist { @expired_events[1]["elapsed_time"] } == 31
+        insist { @expired_events[0].get("elapsed_time") } == 30
+        insist { @expired_events[1].get("elapsed_time") } == 31
       end
 
       it "creates a new event containing an 'elapsed_timestamp_start field' with the timestamp of the expired 'start event'" do
-        insist { @expired_events[0]["elapsed_timestamp_start"] } == @start_event_2["@timestamp"]
-        insist { @expired_events[1]["elapsed_timestamp_start"] } == @start_event_3["@timestamp"]
+        insist { @expired_events[0].get("elapsed_timestamp_start") } == @start_event_2.get("@timestamp")
+        insist { @expired_events[1].get("elapsed_timestamp_start") } == @start_event_3.get("@timestamp")
       end
 
       it "creates a new event containing a 'host field' for each expired 'start event'" do
-        insist { @expired_events[0]["host"] } == Socket.gethostname
-        insist { @expired_events[1]["host"] } == Socket.gethostname
+        insist { @expired_events[0].get("host") } == Socket.gethostname
+        insist { @expired_events[1].get("host") } == Socket.gethostname
       end
     end
   end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-elapsed
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -38,7 +44,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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
+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
 email: info@elastic.co
 executables: []
 extensions: []