adp-fluent-plugin-graphite 0.0.19 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ec7994190ada35fdac587e172689dbf5dbac317a81908e9c887ef5b9bcff086
-  data.tar.gz: a7d66b34f986653f8746d27bb6f5831f53ff9c3e4c486a4d55af041421b14b7b
+  metadata.gz: b10efa44d94d4c13b3cacb907c15d7d5775b3a5c0ef10dfb81069d2ea69aeb34
+  data.tar.gz: ecd6691d95ce2e20647a60f90e7065345113a0a2059fe13fe4db1f65b3a15460
 SHA512:
-  metadata.gz: 510c48db7df2865b141198ad3f0eb0f14a4a9994e197673b55659558a1b10442cc1d70e159d8a2a49b3ae878c2d6081f99f82182ebca51cea0418bb2c6b988fc
-  data.tar.gz: 0b6b35d3afba2374aa90e204c88cbb2ec850ad3d90169030d48464e7a19f9eece20a678df9ad1a9c1de4107aeba81f0bd1869228a56d840752c1ef4960b9e000
+  metadata.gz: 320fc2f809cb97b2a0992f801365a60e5fc63586e46d2f9f9a32fa98d18350998149c6e1418f19abd2b2446a764de8647106f86c4d022a80356e4dfca733c667
+  data.tar.gz: 5e497eb638eeeea3b6757a169ce23b37845f35f240cf555a9b5c79b449bf4c46dfacf27211a8d4419e0f675eec03eaf204cc98eb08e92fb7d479932cb81b1d9c

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

data/lib/fluent/plugin/filter_graphite.rb

@@ -0,0 +1,31 @@
+require 'fluent/plugin/graphite'
+require 'fluent/plugin/filter'
+
+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,8 +1,10 @@
+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
@@ -11,15 +13,9 @@ module Fluent::Plugin
     config_param :max_retries, :integer, default: 3
     config_param :log_level, :string, default: 'info'
 
-    def initialize
-      super
-      require 'graphite-api'
-      log.info("Initialize graphite plugin")
-    end
-
     def start
       super
-      connect_client!
+      init_client(@log_level, @host, @port)
     end
 
     def configure(conf)
@@ -37,66 +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)
-    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 init_logger
-      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 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
-      init_logger
-      log.info("Starting graphite 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.19
+  version: 0.1.3
 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