adp-fluent-plugin-graphite 0.0.18 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c696abc25c0b8423a39559a766b709b461c53383fe664d317065683db4b8e61c
-  data.tar.gz: 65dc4925391a451d7c33dd1e57814c2abc471ab80f646991d8aa668bfc858b67
+  metadata.gz: 91a11f6d33ffb459b113d744d38951631f6f8a43203799e23163da7350e2c93d
+  data.tar.gz: cb51400a9d54217313775338329e73407e40868a0152e0f7452a22d7aa2c0334
 SHA512:
-  metadata.gz: 18c4f641033cff5dee5e3841284a14a6eb66859fd307ff9bf7b2ffebaa584c67bdbe38eb18cea2ac76b3b12cfa54acd0d6ffdf9e49d897ba56f8199975df4840
-  data.tar.gz: 630da8b77e2fea85bc014f7f260d51906596e7de95568a74cb7a23dcf6b92512b57ce3743cd52126d2ee570338fac6e26ff8ccc78c7e7cf776a06988029591f3
+  metadata.gz: d2286a09376b57fe11e4f09e44d190f81213a3ed99f54b66c6756e70ebaf570424b1809020ccbf028240a770c5b16b3cc3a1c1287b7d14cf28907fea6b02085d
+  data.tar.gz: 71af86c21bf2ce619c21e70d64b599869de200a5164cced81db56d62e9898b8d0e5ace5ce9d44986f4bcbc48894f4e6e591e323369945d635269c777eb3ce4b8

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.18'
+  gem.version     = '0.1.2'
   gem.authors     = ['Aleksander Dudek']
   gem.email       = 'adudek4@gmail.com'
   gem.homepage    = ''

data/lib/fluent/plugin/filter_graphite.rb

@@ -0,0 +1,30 @@
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
+  class GraphiteFilter < Fluent::Plugin::Filter
+    Fluent::Plugin.register_filter('graphite', self)
+    include Fluent::Plugin::Graphite
+
+    config_param :host, :string
+    config_param :port, :integer, default: 2003
+    config_param :prefix, :string, default: 'adp-fluentd-agent'
+    config_param :monitoring_key, :string
+    config_param :max_retries, :integer, default: 3
+    config_param :log_level, :string, default: 'info'
+
+    def start
+      super
+      init_client(@log_level, @host, @port)
+    end
+
+    def configure(conf)
+      super
+    end
+
+    def filter(tag, time, record)
+      metrics = format_metrics(tag, record)
+      post(metrics, time)
+      record
+    end
+  end
+end

data/lib/fluent/plugin/graphite.rb

@@ -0,0 +1,75 @@
+module Fluent
+  module Plugin
+    module Graphite
+
+      def initialize
+        super
+        require 'graphite-api'
+        log.info("Initialize graphite plugin")
+      end
+
+      def init_logger(log_level)
+        if log_level == 'debug'
+          GraphiteAPI::Logger.init level: :debug
+        end
+        if log_level == 'warn'
+          GraphiteAPI::Logger.init level: :warn
+        end
+        if log_level == 'info'
+          GraphiteAPI::Logger.init level: :info
+        end
+        if log_level == 'error'
+          GraphiteAPI::Logger.init level: :error
+        end
+      end
+
+      def init_client(log_level, host, port)
+        options = {
+          # Required: valid URI {udp,tcp}://host:port/?timeout=seconds
+          graphite: "tcp://#{host}:#{port}",
+
+          # Optional: results are aggregated in 60 seconds slices ( default is 60 )
+          slice: 30,
+
+          # Optional: send to graphite every 60 seconds ( default is 0 - direct send )
+          interval: 30,
+
+          # Optional: set the max age in seconds for records reanimation ( default is 12 hours )
+          cache: 4 * 60 * 60,
+        }
+        @client = GraphiteAPI.new options
+        init_logger(log_level)
+        log.info("Starting graphite client")
+      end
+
+      def format_metrics(tag, record)
+        metrics = {}
+        key = @monitoring_key + "." + @prefix + "." + tag
+        metrics[key] = 1
+        metrics
+      end
+
+
+      def post(metric, time)
+        trial ||= 1
+        @client.metrics(metric, 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
+          ::Graphite.init_client(@log_level, @host, @port)
+          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
+    end
+  end
+end

data/lib/fluent/plugin/out_graphite.rb

@@ -1,38 +1,30 @@
+require 'fluent/plugin/graphite'
 require 'fluent/plugin/output'
 
 module Fluent::Plugin
   class GraphiteOutput < Fluent::Plugin::Output
     Fluent::Plugin.register_output('graphite', self)
+    include Fluent::Plugin::Graphite
 
     config_param :host, :string
     config_param :port, :integer, default: 2003
     config_param :prefix, :string, default: 'adp-fluentd-agent'
     config_param :monitoring_key, :string
-    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
+    config_param :log_level, :string, default: 'info'
 
     def start
       super
-      connect_client!
+      init_client(@log_level, @host, @port)
     end
 
     def configure(conf)
       super
-      if @name_keys
-        @name_keys = @name_keys.split(',')
-      end
     end
 
     def process(tag, es)
       es.each do |time, record|
         emit_tag = tag.dup
-        log.info("Emit graphite plugin: #{record}")
         metrics = format_metrics(emit_tag, record)
 
         # implemented to immediate call post method in this loop, because graphite-api.gem has the buffers.
@@ -41,52 +33,5 @@ module Fluent::Plugin
 
     end
 
-    def format_metrics(tag, record)
-      metrics = {}
-      key = @monitoring_key + "." + @prefix + "." + tag
-      metrics[key] = 1
-      metrics
-    end
-
-    def post(metric, time)
-      trial ||= 1
-      @client.metrics(metric, time)
-      log.warn("Sending metrics: #{metric}")
-    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!
-      options = {
-        # Required: valid URI {udp,tcp}://host:port/?timeout=seconds
-        graphite: "tcp://#{@host}:#{@port}",
-
-        # Optional: results are aggregated in 60 seconds slices ( default is 60 )
-        slice: 30,
-
-        # Optional: send to graphite every 60 seconds ( default is 0 - direct send )
-        interval: 30,
-
-        # Optional: set the max age in seconds for records reanimation ( default is 12 hours )
-        cache: 4 * 60 * 60,
-      }
-      @client = GraphiteAPI.new options
-      GraphiteAPI::Logger.init level: :debug
-      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.18
+  version: 0.1.2
 platform: ruby
 authors:
 - Aleksander Dudek
@@ -79,6 +79,8 @@ files:
 - README.md
 - Rakefile
 - adp-fluent-plugin-graphite.gemspec
+- lib/fluent/plugin/filter_graphite.rb
+- lib/fluent/plugin/graphite.rb
 - lib/fluent/plugin/out_graphite.rb
 - test/helper.rb
 - test/plugin/test_out_graphite.rb