fluent-plugin-graphite 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb2b5a48b74f901c54c21c8fb7c0bf4492358fbf
-  data.tar.gz: 1049ff77493b983e5e9fff69c9acee314399f211
+  metadata.gz: 02cf8a6679ad334eb0e532d8777b74dee55f2182
+  data.tar.gz: 3d832195d3b3b51aac2aae953898e709146e2779
 SHA512:
-  metadata.gz: 7523d45cc02152cc0508fa2b4b2b7aa9a0d63f7012bf9d49c9c7c76f9e135cb1d9cb0ebe04c89db734505c132cff1f21b04209fca31f901d76695354c8f799de
-  data.tar.gz: e780bb5924d6bc48f0607c491fc01285519e501d9d683db27b251fb359a13973b0e299e6482b723765176e68c45ffc3fd9f17867cc473adbbf36f03990dbe618
+  metadata.gz: f29680eb0e6c9b510aacc5e98f4a86c12748a1afc0b87b2cb2534252bc350a5543a9bcb49dd86535bff0615d41d472b982ae6f29033036777fac1011db39fbb5
+  data.tar.gz: 5801fe77f4c62e6e16de13e575c42864403df0535cbc56b11c782fb31afa148a5799886731948d76e7dac073330d6cc6f3048ba2268bb3a4ec326a52b4bed392

data/fluent-plugin-graphite.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = 'fluent-plugin-graphite'
-  gem.version     = '0.0.6'
+  gem.version     = '0.0.7'
   gem.authors     = ['Satoshi SUZUKI']
   gem.email       = 'studio3104.com@gmail.com'
   gem.homepage    = 'https://github.com/studio3104/fluent-plugin-graphite'
@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'fluent-mixin-rewrite-tag-name'
   gem.add_runtime_dependency 'graphite-api'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'test-unit', '~> 3.2.0'
 end

data/lib/fluent/plugin/out_graphite.rb

@@ -24,7 +24,7 @@ class Fluent::GraphiteOutput < Fluent::Output
 
   def start
     super
-    @client = GraphiteAPI.new(graphite: "#{@host}:#{@port}")
+    connect_client!
   end
 
   def configure(conf)
@@ -47,6 +47,8 @@ class Fluent::GraphiteOutput < Fluent::Output
     if @name_key_pattern
       @name_key_pattern = Regexp.new(@name_key_pattern)
     end
+    # How many times to retry the call if timeout raised
+    @max_retries ||= 3
   end
 
   def emit(tag, es, chain)
@@ -64,9 +66,9 @@ class Fluent::GraphiteOutput < Fluent::Output
 
   def format_metrics(tag, record)
     filtered_record = if @name_keys
-                        record.select { |k,v| @name_keys.include?(k) }
+                        record.select { |k,v| @name_keys.include?(k.to_s) }
                       else # defined @name_key_pattern
-                        record.select { |k,v| @name_key_pattern.match(k) }
+                        record.select { |k,v| @name_key_pattern.match(k.to_s) }
                       end
 
     return nil if filtered_record.empty?
@@ -75,9 +77,9 @@ class Fluent::GraphiteOutput < Fluent::Output
     tag = tag.sub(/\.$/, '') # may include a dot at the end of the emit_tag fluent-mixin-rewrite-tag-name returns. remove it.
     filtered_record.each do |k, v|
       key = case @tag_for
-            when 'ignore' then k
-            when 'prefix' then tag + '.' + k
-            when 'suffix' then k + '.' + tag
+            when 'ignore' then k.to_s
+            when 'prefix' then "#{tag}.#{k}"
+            when 'suffix' then "#{k}.#{tag}"
             end
 
       key = key.gsub(/(\s|\/)+/, '_') # cope with in the case of containing symbols or spaces in the key of the record like in_dstat.
@@ -87,10 +89,27 @@ class Fluent::GraphiteOutput < Fluent::Output
   end
 
   def post(metrics, time)
+    trial ||= 1
     @client.metrics(metrics, time)
+  rescue Errno::ETIMEDOUT
+    # after long periods with nothing emitted, the connection will be closed and result in timeout
+    if trial <= @max_retries
+      log.warn "out_graphite: connection timeout to #{@host}:#{@port}. Reconnecting... "
+      trial += 1
+      connect_client!
+      retry
+    else
+      log.error "out_graphite: ERROR: connection timeout to #{@host}:#{@port}. Exceeded max_retries #{@max_retries}"
+    end
   rescue Errno::ECONNREFUSED
     log.warn "out_graphite: connection refused by #{@host}:#{@port}"
   rescue SocketError => se
     log.warn "out_graphite: socket error by #{@host}:#{@port} :#{se}"
+  rescue StandardError => e
+    log.error "out_graphite: ERROR: #{e}"
+  end
+  
+  def connect_client!
+    @client = GraphiteAPI.new(graphite: "#{@host}:#{@port}")
   end
 end

data/test/plugin/test_out_graphite.rb

@@ -83,7 +83,7 @@ class GraphiteOutputTest < Test::Unit::TestCase
     assert_raise(Fluent::ConfigError) { d = create_driver(CONFIG_SPECIFY_BOTH_NAME_KEYS_AND_NAME_KEY_PATTERN) }
   end
 
-  def test_format_metrics
+  def test_format_metrics_strings
     record = {
       'hostname' => 'localhost.localdomain',
       'dstat.total cpu usage.usr' => '0.0',
@@ -94,6 +94,24 @@ class GraphiteOutputTest < Test::Unit::TestCase
       'dstat.total cpu usage.siq' => '0.0'
     }
 
+    run_format_metrics_assertions(record)
+  end
+  
+  def test_format_metrics_symbols
+    record = {
+      :'hostname'                  => 'localhost.localdomain',
+      :'dstat.total cpu usage.usr' => '0.0',
+      :'dstat.total cpu usage.sys' => '0.0',
+      :'dstat.total cpu usage.idl' => '100.0',
+      :'dstat.total cpu usage.wai' => '0.0',
+      :'dstat.total cpu usage.hiq' => '0.0',
+      :'dstat.total cpu usage.siq' => '0.0'
+    }
+
+    run_format_metrics_assertions(record)
+  end
+  
+  def run_format_metrics_assertions(record)
     d = create_driver
     m1 = d.instance.format_metrics('test.', record)
     assert_equal m1, { 'test.dstat.total_cpu_usage.usr' => 0.0, 'test.dstat.total_cpu_usage.sys' => 0.0, 'test.dstat.total_cpu_usage.idl' => 100.0, 'test.dstat.total_cpu_usage.wai' => 0.0, 'test.dstat.total_cpu_usage.hiq' => 0.0, 'test.dstat.total_cpu_usage.siq' => 0.0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Satoshi SUZUKI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: fluentd output plugin to send metrics to graphite
 email: studio3104.com@gmail.com
 executables: []
@@ -102,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin to send metrics to graphite