adp-fluent-plugin-graphite 0.0.16 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdc659c05139601bebe60bb78d620f621f325eb1b6d7818b4d3cda32507b8f6b
-  data.tar.gz: b08bf8c9d21ea555b1ff54f0bb5fc474ef8957e8661f0a9aa6305ddfc5e7efd4
+  metadata.gz: dcb0b99995de71b515fd3b5934589d95af6cfdbdbca9ccac9ac6ac349720d02c
+  data.tar.gz: 384393b27c068712191daeb631a16fb5c7f9ef641bad7f8e396ce7733283569f
 SHA512:
-  metadata.gz: 864cd915362d2c9911bacf8f7b65b6fa5b465dbaee05a17f89d7cc19280e55575726101a3a78d893d06fdae7597ac9e6db38d73e3196981ee66390e7c942767c
-  data.tar.gz: 43681aace2378bb5c7969eccf0c7d6567c3dc6ed2bd272be4ad24b9a0841f66aca3781c167d0b0c3968cb891254b68302122ffc25f316b46185f12c82642557c
+  metadata.gz: ad9e87463588d24c7fcad9b90d54993aecf05269284c3e3b740f66d038e96c9e28468de7ee58cdc0d73455fd7762203eaa1e416f2e60416e1ecd1ee9b542b559
+  data.tar.gz: 4a58e1b33b50e3c38de527a6a97c7e5a649b5a77955a9c4783054db6f1aaa10c26703428078f9acf5082546a980ed156ca702bfcfff3bcd9b7fc6ef58c6cc9d7

data/adp-fluent-plugin-graphite.gemspec

@@ -3,10 +3,10 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = 'adp-fluent-plugin-graphite'
-  gem.version     = '0.0.16'
-  gem.authors     = ['Satoshi SUZUKI']
-  gem.email       = 'studio3104.com@gmail.com'
-  gem.homepage    = 'https://github.com/studio3104/fluent-plugin-graphite'
+  gem.version     = '0.1.0'
+  gem.authors     = ['Aleksander Dudek']
+  gem.email       = 'adudek4@gmail.com'
+  gem.homepage    = ''
   gem.description = 'fluentd output plugin to send metrics to graphite'
   gem.summary     = gem.description
   gem.licenses    = ['MIT']

data/lib/fluent/plugin/filter_graphite.rb

@@ -0,0 +1,28 @@
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
+  class GraphiteFilter < Fluent::Plugin::Filter
+    Fluent::Plugin.register_filter('graphite', self)
+    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
+      ::Graphite.init_client(@log_level, @host, @port)
+    end
+
+    def configure(conf)
+      super
+    end
+
+    def filter(tag, time, record)
+      metrics = ::Graphite.format_metrics(tag, record)
+      ::Graphite.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,95 +1,37 @@
+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 :tag_for, :string, default: 'prefix'
+    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!
+      ::Graphite.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)
+        metrics = ::Graphite.format_metrics(emit_tag, record)
 
         # implemented to immediate call post method in this loop, because graphite-api.gem has the buffers.
-        post(metrics, time)
+        ::Graphite.post(metrics, time)
       end
 
     end
 
-    def format_metrics(tag, record)
-      metrics = {}
-      metrics[@monitoring_key + "." + tag] = 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: 60,
-
-        # 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,
-
-        # Optional: The default aggregation method for multiple reports in the same slice (default is :sum).
-        # Possible options: :sum, :avg, :replace
-        default_aggregation_method: :avg
-      }
-      @client = GraphiteAPI.new options
-      GraphiteAPI::Logger.init level: :debug
-      log.info("starting client")
-    end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: adp-fluent-plugin-graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors:
-- Satoshi SUZUKI
+- Aleksander Dudek
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: fluentd output plugin to send metrics to graphite
-email: studio3104.com@gmail.com
+email: adudek4@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -79,10 +79,12 @@ 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
-homepage: https://github.com/studio3104/fluent-plugin-graphite
+homepage: ''
 licenses:
 - MIT
 metadata: {}