logstash-filter-metrics 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b8d5514f0d143b9589a711d713159154cb0ec04
-  data.tar.gz: abff8e6f3042590dfaffd40db40666c7cf13e7e2
+  metadata.gz: 669b8830b869a967bb698f160c6f0a599caa8182
+  data.tar.gz: bcc4c55dc48d8be54205c152acf7e69e33db0b76
 SHA512:
-  metadata.gz: 088fe7feec3dc422f2eb20e2b1777ccef5ddf02272f4ab0fd128df23fd065cad21b5d742d64685b8833e0dd204093df59a6bc2db5572de1be8534d6e0f815ccc
-  data.tar.gz: af48f423cebed70d6044d5374f7a8f8e8530e1e61c5292ad1996d35424fe1b91d46ce0afe1e280a59ce05ededfd4875c893bbfd5ffa798a9fca1c0aa51e0dece
+  metadata.gz: ad2e3d7e90cfbbfbc367d4a5abfb8fb03f7bbbb4afbad767bb3128df886c243eab71ca5e3d156cad66a14dd378d93b8d6f68a076fe8375c564bf4bbb2da3ee52
+  data.tar.gz: eb2463f0ed8663c7fab7af768ae55d91c2a2d93b09269de4713b582846168cc4c43ea2ca0082b0df1c4ef495f7cd116599af63341728c30288059cd173f4da93

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 4.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 # 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

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

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-metrics-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-metrics-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-metrics.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-metrics)
 
 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/metrics.rb

@@ -190,7 +190,7 @@ class LogStash::Filters::Metrics < LogStash::Filters::Base
     return unless should_flush?
 
     event = LogStash::Event.new
-    event["message"] = Socket.gethostname
+    event.set("message", Socket.gethostname)
     @metric_meters.each_pair do |name, metric|
       flush_rates event, name, metric
       metric.clear if should_clear?
@@ -199,14 +199,14 @@ class LogStash::Filters::Metrics < LogStash::Filters::Base
     @metric_timers.each_pair do |name, metric|
       flush_rates event, name, metric
       # These 4 values are not sliding, so they probably are not useful.
-      event["[#{name}][min]"] = metric.min
-      event["[#{name}][max]"] = metric.max
+      event.set("[#{name}][min]", metric.min)
+      event.set("[#{name}][max]", metric.max)
       # timer's stddev currently returns variance, fix it.
-      event["[#{name}][stddev]"] = metric.stddev ** 0.5
-      event["[#{name}][mean]"] = metric.mean
+      event.set("[#{name}][stddev]", metric.stddev ** 0.5)
+      event.set("[#{name}][mean]", metric.mean)
 
       @percentiles.each do |percentile|
-        event["[#{name}][p#{percentile}]"] = metric.snapshot.value(percentile / 100.0)
+        event.set("[#{name}][p#{percentile}]", metric.snapshot.value(percentile / 100.0))
       end
       metric.clear if should_clear?
     end
@@ -237,10 +237,10 @@ class LogStash::Filters::Metrics < LogStash::Filters::Base
   private
 
   def flush_rates(event, name, metric)
-      event["[#{name}][count]"] = metric.count
-      event["[#{name}][rate_1m]"] = metric.one_minute_rate if @rates.include? 1
-      event["[#{name}][rate_5m]"] = metric.five_minute_rate if @rates.include? 5
-      event["[#{name}][rate_15m]"] = metric.fifteen_minute_rate if @rates.include? 15
+      event.set("[#{name}][count]", metric.count)
+      event.set("[#{name}][rate_1m]", metric.one_minute_rate) if @rates.include? 1
+      event.set("[#{name}][rate_5m]", metric.five_minute_rate) if @rates.include? 5
+      event.set("[#{name}][rate_15m]", metric.fifteen_minute_rate) if @rates.include? 15
   end
 
   def metric_key(key)

data/logstash-filter-metrics.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-metrics'
-  s.version         = '3.0.2'
+  s.version         = '4.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The metrics filter is useful for aggregating metrics."
-  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", "~> 2.0"
   s.add_runtime_dependency "metriks"                          #(MIT license)
   s.add_runtime_dependency "thread_safe"
 

data/spec/filters/metrics_spec.rb

@@ -29,8 +29,8 @@ describe LogStash::Filters::Metrics do
 
         it "should flush counts" do
           insist { subject.length } == 1
-          insist { subject.first["http_200"]["count"] } == 2
-          insist { subject.first["http_404"]["count"] } == 1
+          insist { subject.first.get("http_200")["count"] } == 2
+          insist { subject.first.get("http_404")["count"] } == 1
         end
 
         it "should include rates and percentiles" do
@@ -38,7 +38,7 @@ describe LogStash::Filters::Metrics do
           rates = [ "rate_1m", "rate_5m", "rate_15m" ]
           meters.each do |meter|
             rates.each do |rate|
-              insist { subject.first[meter] }.include? rate
+              insist { subject.first.get(meter) }.include? rate
             end
           end
         end
@@ -56,8 +56,8 @@ describe LogStash::Filters::Metrics do
           events = filter.flush
           events = filter.flush
           insist { events.length } == 1
-          insist { events.first["http_200"]["count"] } == 2
-          insist { events.first["http_404"]["count"] } == 1
+          insist { events.first.get("http_200")["count"] } == 2
+          insist { events.first.get("http_404")["count"] } == 1
         end
       end
     end
@@ -78,7 +78,7 @@ describe LogStash::Filters::Metrics do
         }
 
         it "should include only the requested rates" do
-          rate_fields = subject.first["http_200"].to_hash.keys.select {|field| field.start_with?("rate") }
+          rate_fields = subject.first.get("http_200").to_hash.keys.select {|field| field.start_with?("rate") }
           insist { rate_fields.length } == 1
           insist { rate_fields }.include? "rate_1m"
         end
@@ -114,10 +114,10 @@ describe LogStash::Filters::Metrics do
       events1 = filter1.flush
       events2 = filter2.flush
 
-      insist { events1.first["http_200"]["count"] } == 1
-      insist { events2.first["http_200"]["count"] } == 2
-      insist { events1.first["http_404"]["count"] } == 1
-      insist { events2.first["http_404"] } == nil
+      insist { events1.first.get("http_200")["count"] } == 1
+      insist { events2.first.get("http_200")["count"] } == 2
+      insist { events1.first.get("http_404")["count"] } == 1
+      insist { events2.first.get("http_404") } == nil
     end
   end
 
@@ -135,34 +135,34 @@ describe LogStash::Filters::Metrics do
 
       it "should flush counts" do
         insist { subject.length } == 1
-        insist { subject.first["http_request_time"]["count"] } == 3
+        insist { subject.first.get("http_request_time")["count"] } == 3
       end
 
       it "should include rates and percentiles keys" do
         metrics = ["rate_1m", "rate_5m", "rate_15m", "p1", "p5", "p10", "p90", "p95", "p99"]
         metrics.each do |metric|
-          insist { subject.first["http_request_time"] }.include? metric
+          insist { subject.first.get("http_request_time") }.include? metric
         end
       end
 
       it "should include min value" do
-        insist { subject.first['http_request_time']['min'] } == 10.0
+        insist { subject.first.get("http_request_time")['min'] } == 10.0
       end
 
       it "should include mean value" do
-        insist { subject.first['http_request_time']['mean'] } == 20.0
+        insist { subject.first.get("http_request_time")['mean'] } == 20.0
       end
 
       it "should include stddev value" do
-        insist { subject.first['http_request_time']['stddev'] } == Math.sqrt(10.0)
+        insist { subject.first.get("http_request_time")['stddev'] } == Math.sqrt(10.0)
       end
 
       it "should include max value" do
-        insist { subject.first['http_request_time']['max'] } == 30.0
+        insist { subject.first.get("http_request_time")['max'] } == 30.0
       end
 
       it "should include percentile value" do
-        insist { subject.first['http_request_time']['p99'] } == 30.0
+        insist { subject.first.get("http_request_time")['p99'] } == 30.0
       end
     end
   end
@@ -183,17 +183,17 @@ describe LogStash::Filters::Metrics do
 
       it "should flush counts" do
         insist { subject.length } == 1
-        insist { subject.first["http_request_time"]["count"] } == 1
+        insist { subject.first.get("http_request_time")["count"] } == 1
       end
 
       it "should include only the requested rates" do
-        rate_fields = subject.first["http_request_time"].to_hash.keys.select {|field| field.start_with?("rate") }
+        rate_fields = subject.first.get("http_request_time").to_hash.keys.select {|field| field.start_with?("rate") }
         insist { rate_fields.length } == 1
         insist { rate_fields }.include? "rate_1m"
       end
 
       it "should include only the requested percentiles" do
-        percentile_fields = subject.first["http_request_time"].to_hash.keys.select {|field| field.start_with?("p") }
+        percentile_fields = subject.first.get("http_request_time").to_hash.keys.select {|field| field.start_with?("p") }
         insist { percentile_fields.length } == 2
         insist { percentile_fields }.include? "p1"
         insist { percentile_fields }.include? "p2"
@@ -225,9 +225,9 @@ describe LogStash::Filters::Metrics do
       filter.register
       filter.filter LogStash::Event.new({"response" => 200})
 
-      insist { filter.flush.first["http_200"]["count"] } == 1 # 5s
-      insist { filter.flush.first["http_200"]["count"] } == 1 # 10s
-      insist { filter.flush.first["http_200"]["count"] } == 1 # 15s
+      insist { filter.flush.first.get("http_200")["count"] } == 1 # 5s
+      insist { filter.flush.first.get("http_200")["count"] } == 1 # 10s
+      insist { filter.flush.first.get("http_200")["count"] } == 1 # 15s
       insist { filter.flush }.nil?                         # 20s
     end
   end

metadata

@@ -1,72 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-metrics
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: logstash-core-plugin-api
-  prerelease: false
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: metriks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: metriks
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: thread_safe
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !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: []
@@ -87,7 +89,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -102,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: The metrics filter is useful for aggregating metrics.
 test_files: