logstash-output-graphite 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b011a8afde4eaa11d8d81019c56a84377c2c1db
-  data.tar.gz: 8cf4c99d2cc31dfa23e1ee3558c23ac04488fb42
+  metadata.gz: 0b0fcc4d3ba4675e46b147a8e8fabd2fc24387c3
+  data.tar.gz: afb15d9df4d24266a16a05abe6dd9832360bc34a
 SHA512:
-  metadata.gz: 555ae0f0f9f0fe87bef65d5e23b65ce1aee51ddff0bbc3976bca5b908600e78e3afa7476f222e31ed9ace5973d6bc671d881fec44bdc2595dda13e2088db748e
-  data.tar.gz: c7671e873098a4f7afeca2d3d965761545305060fd506efb7e0b30b759da4d17c1a458805ced7b3e663c96da0b87ccf2929ac906d6ce2aa8b56233b8bec92308
+  metadata.gz: 5e16bf4dd0736a352c1b44eeeee96cb229319a97132cd16ec26480536702f7b3d4c766b9c3747da3065ccd2a3f3425d62c97c243d922d78e0e7245153bccbcd6
+  data.tar.gz: 54d208eff8bfe710bef705cceb4b1faac4e0bdc56314187019e2c18deda14fe038054e695821b231b5f4978069c7d00f27be75e722e166a2ef15ffb79bd296bd

data/CHANGELOG.md

@@ -1,9 +1,13 @@
+## 2.0.3
+ - Fixed empty/nil messages handling
+
 ## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ - 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
 
-- 1.0.2
-  * Added support for sprintf in field formatting
-- 1.0.1
-  * Added support for nested hashes as values
+## 1.0.2
+ - Added support for sprintf in field formatting
+
+## 1.0.1
+ - Added support for nested hashes as values

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-graphite-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-graphite-unit/)
+
 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.

data/lib/logstash/outputs/graphite.rb

@@ -30,7 +30,7 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
   config :resend_on_failure, :validate => :boolean, :default => false
 
   # The metric(s) to use. This supports dynamic strings like %{host}
-  # for metric names and also for values. This is a hash field with key 
+  # for metric names and also for values. This is a hash field with key
   # being the metric name, value being the metric value. Example:
   # [source,ruby]
   #     metrics => { "%{host}/uptime" => "%{uptime_1m}" }
@@ -90,19 +90,18 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
     end
 
     connect
-  end # def register
+  end
 
   def connect
     # TODO(sissel): Test error cases. Catch exceptions. Find fortune and glory. Retire to yak farm.
     begin
       @socket = TCPSocket.new(@host, @port)
     rescue Errno::ECONNREFUSED => e
-      @logger.warn("Connection refused to graphite server, sleeping...",
-                   :host => @host, :port => @port)
+      @logger.warn("Connection refused to graphite server, sleeping...", :host => @host, :port => @port)
       sleep(@reconnect_interval)
       retry
     end
-  end # def connect
+  end
 
   def construct_metric_name(event, metric)
     if @metrics_format
@@ -113,41 +112,41 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
     metric
   end
 
-  public
   def receive(event)
-    
-
     # Graphite message format: metric value timestamp\n
 
-    messages = @fields_are_metrics ?
-      messages_from_event_fields(event, @include_metrics, @exclude_metrics) :
-      messages_from_event_metrics(event, @metrics)
+    # compact to remove nil messages which produces useless \n
+    messages = (
+      @fields_are_metrics \
+        ? messages_from_event_fields(event, @include_metrics, @exclude_metrics)
+        : messages_from_event_metrics(event, @metrics)
+    ).compact
 
     if messages.empty?
-      @logger.debug("Message is empty, not sending anything to Graphite", :messages => messages, :host => @host, :port => @port)
+      @logger.debug? && @logger.debug("Message is empty, not sending anything to Graphite", :messages => messages, :host => @host, :port => @port)
     else
       message = messages.join("\n")
-      @logger.debug("Sending carbon messages", :messages => messages, :host => @host, :port => @port)
+      @logger.debug? && @logger.debug("Sending carbon messages", :messages => messages, :host => @host, :port => @port)
 
       # Catch exceptions like ECONNRESET and friends, reconnect on failure.
       # TODO(sissel): Test error cases. Catch exceptions. Find fortune and glory.
       begin
         @socket.puts(message)
       rescue Errno::EPIPE, Errno::ECONNRESET, IOError => e
-        @logger.warn("Connection to graphite server died",
-                     :exception => e, :host => @host, :port => @port)
+        @logger.warn("Connection to graphite server died", :exception => e, :host => @host, :port => @port)
         sleep(@reconnect_interval)
         connect
         retry if @resend_on_failure
       end
     end
-  end # def receive
+  end
 
   private
 
   def messages_from_event_fields(event, include_metrics, exclude_metrics)
-    timestamp = event_timestamp(event)
     @logger.debug? && @logger.debug("got metrics event", :metrics => event.to_hash)
+
+    timestamp = event_timestamp(event)
     event.to_hash.flat_map do |metric,value|
       next if EXCLUDE_ALWAYS.include?(metric)
       next unless include_metrics.empty? || include_metrics.any? { |regexp| metric.match(regexp) }
@@ -160,7 +159,8 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
   def messages_from_event_metrics(event, metrics)
     timestamp = event_timestamp(event)
     metrics.flat_map do |metric, value|
-      @logger.debug("processing", :metric => metric, :value => value)
+      @logger.debug? && @logger.debug("processing", :metric => metric, :value => value)
+
       metric = event.sprintf(metric)
       next unless @include_metrics.any? {|regexp| metric.match(regexp)}
       next if @exclude_metrics.any? {|regexp| metric.match(regexp)}
@@ -175,7 +175,7 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
 
   def metrics_lines_for_event(event, metric, value, timestamp)
     if event[metric].is_a?(Hash)
-      dotify(event[metric], metric).map do |k,v|
+      dotify(event[metric], metric).map do |k, v|
         metrics_line(event, k, v, timestamp)
       end
     else
@@ -190,9 +190,9 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
   # Take a nested ruby hash of the form {:a => {:b => 2}, c: => 3} and
   # turn it into a hash of the form
   # { "a.b" => 2, "c" => 3}
-  def dotify(hash,prefix=nil)
-    hash.reduce({}) do |acc,kv|
-      k,v = kv
+  def dotify(hash, prefix = nil)
+    hash.reduce({}) do |acc, kv|
+      k, v = kv
       pk = prefix ? "#{prefix}#{@nested_object_separator}#{k}" : k.to_s
       if v.is_a?(Hash)
         acc.merge!(dotify(v, pk))
@@ -205,5 +205,4 @@ class LogStash::Outputs::Graphite < LogStash::Outputs::Base
       acc
     end
   end
-
-end # class LogStash::Outputs::Graphite
+end

data/logstash-output-graphite.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-graphite'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output allows you to pull metrics from your logs and ship them to Graphite"
   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"

data/spec/outputs/graphite_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require_relative '../spec_helper'
 
 describe LogStash::Outputs::Graphite do

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-graphite
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,62 +28,64 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-input-generator
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-input-generator
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-filter-kv
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-filter-kv
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-filter-ruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-filter-ruby
   prerelease: false
   type: :development
-  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
 email: info@elastic.co
 executables: []