logstash-filter-metrics 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae073bd8a88f8fdc36369ac0fbc804e2da56f23e
-  data.tar.gz: 8f9f726f6edb421cb0e52eb891cf123bf12dd720
+  metadata.gz: d4fc93f8263cbaaf90ed6ab1ab2551a6c52c5a2e
+  data.tar.gz: f036d56d5e2cdcda610b22a391064f02672d2317
 SHA512:
-  metadata.gz: 10c21adaf28dc15b484a915c29217a8a5e1861a8bbbd77a020857fc587927197fc0e4dc6040513a77ff4fd634878d69159ccb6c44efb659d1322b38d90d6cb98
-  data.tar.gz: 2b8823c3a5ed75523097408c792193f4b5d08ab84aa9726f2cf65b6b67a93275537cd1ebaac8ed71f9ecbee8218959f738c9161f3aad1e8f617b4a23294ac047
+  metadata.gz: 82a72cdb24ab5d9ce5fa02e00012069c60f83aa0c67a6d3e8e1d96495c34a2af170eb2329741d7485d8171492b587f68779a9768fc9907acf1a6fa75ccf396f4
+  data.tar.gz: 441b646d361ae985950cc51d566b49b7b78cf9f836206d6bf099c559c839c2e3979393a676f59a6be15b7482ab8aa25edb8f752c5037f7ed6bf6914a57eedbee

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.0.4
+  - Fix some documentation issues
+
 ## 4.0.2
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 

data/docs/index.asciidoc

@@ -12,7 +12,7 @@ START - GENERATED VARIABLES, DO NOT EDIT!
 END - GENERATED VARIABLES, DO NOT EDIT!
 ///////////////////////////////////////////
 
-[id="plugins-{type}-{plugin}"]
+[id="plugins-{type}s-{plugin}"]
 
 === Metrics filter plugin
 
@@ -60,12 +60,12 @@ For a `meter => "something"` you will receive the following fields:
 
 ==== `timer` values
 
-For a `timer => [ "thing", "%{duration}" ]` you will receive the following fields:
+For a `timer => { "thing" => "%{duration}" }` you will receive the following fields:
 
 * "[thing][count]" - the total count of events
-* "[thing][rate_1m]" - the per-second event rate in a 1-minute sliding window
-* "[thing][rate_5m]" - the per-second event rate in a 5-minute sliding window
-* "[thing][rate_15m]" - the per-second event rate in a 15-minute sliding window
+* "[thing][rate_1m]" - the per-second average value in a 1-minute sliding window
+* "[thing][rate_5m]" - the per-second average value in a 5-minute sliding window
+* "[thing][rate_15m]" - the per-second average value in a 15-minute sliding window
 * "[thing][min]" - the minimum value seen for this metric
 * "[thing][max]" - the maximum value seen for this metric
 * "[thing][stddev]" - the standard deviation for this metric
@@ -225,4 +225,4 @@ syntax: `timer => [ "name of metric", "%{time_value}" ]`
 
 
 [id="plugins-{type}s-{plugin}-common-options"]
-include::{include_path}/{type}.asciidoc[]
+include::{include_path}/{type}.asciidoc[]

data/lib/logstash/filters/metrics.rb

@@ -158,6 +158,8 @@ class LogStash::Filters::Metrics < LogStash::Filters::Base
     @last_flush = Atomic.new(0) # how many seconds ago the metrics where flushed.
     @last_clear = Atomic.new(0) # how many seconds ago the metrics where cleared.
     @random_key_preffix = SecureRandom.hex
+    # Same as logstash-input-file
+    @host = Socket.gethostname.force_encoding(Encoding::UTF_8)
     unless (@rates - [1, 5, 15]).empty?
       raise LogStash::ConfigurationError, "Invalid rates configuration. possible rates are 1, 5, 15. Rates: #{rates}."
     end
@@ -193,7 +195,7 @@ class LogStash::Filters::Metrics < LogStash::Filters::Base
     return unless should_flush?
 
     event = LogStash::Event.new
-    event.set("message", Socket.gethostname)
+    event.set("message", @host)
     @metric_meters.each_pair do |name, metric|
       flush_rates event, name, metric
       metric.clear if should_clear?

data/logstash-filter-metrics.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-metrics'
-  s.version         = '4.0.3'
+  s.version         = '4.0.4'
   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/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/filters/metrics_spec.rb

@@ -42,6 +42,11 @@ describe LogStash::Filters::Metrics do
             end
           end
         end
+
+        it "should have host in message" do
+          insist { subject.length } == 1
+          reject { subject.first.get("message") }.nil?
+        end
       end
 
       context "on the second flush" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-metrics
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement