adp-fluent-plugin-graphite 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0c30eee533823568e2c81b50b6170e4c27edf21b6658042dcc48bd583ac26b
-  data.tar.gz: e0226b9d11829611e2f7de8e273fa8eee87c13d6f39f3c693126ec7603833ce7
+  metadata.gz: 052c0e2d0e66ba05cb94a995f040c436ada3cad27d1386850d2aca4659152189
+  data.tar.gz: d6333c8cbead5da773384aa63149518d1b9fb8dfbac2dbcec35b1127b1688171
 SHA512:
-  metadata.gz: 6a15fc0687a594a272553b7e785690832822738aaab8672fe82c05577bbeed428587773101e7ef179bf0e4924a03ca8c9a0803ccc94ad149bb5dc10838f2c2b0
-  data.tar.gz: 827807f99db84afdd190c5d7a6640a4b7b5337224b92e50944eb86497eb2aab6240ac949ea338c848e86887e2c15590f7b89bc6e207aec03e341cdfe6f84a994
+  metadata.gz: fd9dd5a45669dec38a3d7498070bd7ac2ad56b8a7c9d150668956270bcb8d4c3a0934f26681929277189afdcdded2c8a8583ac3046b5289c781e2ee567c2d54e
+  data.tar.gz: df3548004608c62f59da0cc3cea317ec3115c685dd7cb419b2182d16337d8cca4ce57209d25fcc0f3bd509c303d294db1be4f3437ac70217ea9dff2dcfb2d044

data/adp-fluent-plugin-graphite.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = 'adp-fluent-plugin-graphite'
-  gem.version     = '0.0.2'
+  gem.version     = '0.0.6'
   gem.authors     = ['Satoshi SUZUKI']
   gem.email       = 'studio3104.com@gmail.com'
   gem.homepage    = 'https://github.com/studio3104/fluent-plugin-graphite'

data/lib/fluent/plugin/out_graphite.rb

@@ -1,116 +1,98 @@
-require 'fluent/mixin/rewrite_tag_name'
-
-class Fluent::GraphiteOutput < Fluent::Output
-  Fluent::Plugin.register_output('graphite', self)
-
-  include Fluent::HandleTagNameMixin
-  include Fluent::Mixin::RewriteTagName
-
-  config_param :host, :string
-  config_param :port, :integer, default: 2003
-  config_param :tag_for, :string, default: 'prefix'
-  config_param :name_keys, :string, default: nil
-  config_param :name_key_pattern, :string, default: nil
-
-  # Define `log` method for v0.10.42 or earlier
-  unless method_defined?(:log)
-    define_method(:log) { $log }
-  end
-
-  def initialize
-    super
-    require 'graphite-api'
-  end
-
-  def start
-    super
-    connect_client!
-  end
-
-  def configure(conf)
-    super
-
-    if !['prefix', 'suffix', 'ignore'].include?(@tag_for)
-      raise Fluent::ConfigError, 'out_graphite: can specify to tag_for only prefix, suffix or ignore'
-    end
-
-    if !@name_keys && !@name_key_pattern
-      raise Fluent::ConfigError, 'out_graphite: missing both of name_keys and name_key_pattern'
-    end
-    if @name_keys && @name_key_pattern
-      raise Fluent::ConfigError, 'out_graphite: cannot specify both of name_keys and name_key_pattern'
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
+  class GraphiteOutput < Output
+    Fluent::Plugin.register_output('graphite', self)
+
+    config_param :host, :string
+    config_param :port, :integer, default: 2003
+    config_param :tag_for, :string, default: 'prefix'
+    config_param :name_keys, :string, default: nil
+    config_param :name_key_pattern, :string, default: nil
+    config_param :max_retries, :integer, default: 3
+
+    def initialize
+      super
+      require 'graphite-api'
+      log.info("Initialize graphite plugin")
     end
 
-    if @name_keys
-      @name_keys = @name_keys.split(',')
-    end
-    if @name_key_pattern
-      @name_key_pattern = Regexp.new(@name_key_pattern)
+    def start
+      super
+      connect_client!
     end
-    # How many times to retry the call if timeout raised
-    @max_retries ||= 3
-  end
 
-  def emit(tag, es, chain)
-    es.each do |time, record|
-      emit_tag = tag.dup
-      filter_record(emit_tag, time, record)
-      next unless metrics = format_metrics(emit_tag, record)
+    def configure(conf)
+      super
 
-      # implemented to immediate call post method in this loop, because graphite-api.gem has the buffers.
-      post(metrics, time)
+      if @name_keys
+        @name_keys = @name_keys.split(',')
+      end
     end
 
-    chain.next
-  end
-
-  def format_metrics(tag, record)
-    filtered_record = if @name_keys
-                        record.select { |k,v| @name_keys.include?(k.to_s) }
-                      else # defined @name_key_pattern
-                        record.select { |k,v| @name_key_pattern.match(k.to_s) }
-                      end
+    def emit(tag, es, chain)
+      es.each do |time, record|
+        emit_tag = tag.dup
+        log.info("Emit graphite plugin: #{record}")
+        next unless metrics = format_metrics(emit_tag, record)
 
-    return nil if filtered_record.empty?
+        # implemented to immediate call post method in this loop, because graphite-api.gem has the buffers.
+        post(metrics, time)
+      end
 
-    metrics = {}
-    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.to_s
-            when 'prefix' then "#{tag}.#{k}"
-            when 'suffix' then "#{k}.#{tag}"
-            end
+      chain.next
+    end
 
-      key = key.gsub(/(\s|\/)+/, '_') # cope with in the case of containing symbols or spaces in the key of the record like in_dstat.
-      metrics[key] = v.to_f
+    def format_metrics(tag, record)
+      filtered_record = if @name_keys
+                          record.select { |k, v| @name_keys.include?(k.to_s) }
+                        else
+                          # defined @name_key_pattern
+                          record.select { |k, v| @name_key_pattern.match(k.to_s) }
+                        end
+
+      return nil if filtered_record.empty?
+
+      metrics = {}
+      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.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.
+        metrics[key] = v.to_f
+      end
+      metrics
     end
-    metrics
-  end
 
-  def post(metrics, time)
-    trial ||= 1
-    @client.metrics(metrics, time)
-    log.warn "Sending metrics: #{metrics}"
-  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}"
+    def post(metrics, time)
+      trial ||= 1
+      @client.metrics(metrics, time)
+      log.warn("Sending metrics: #{metrics}")
+    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
-  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}")
+    def connect_client!
+      @client = GraphiteAPI.new(graphite: "#{@host}:#{@port}")
+      log.info("starting client")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adp-fluent-plugin-graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Satoshi SUZUKI