adp-fluent-plugin-graphite 0.0.15 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d7ea3516d03ae9df0d626c97453daa20ca97c86491e4ebbeb47bdf8bb0a95e3
-  data.tar.gz: f306f5437dd3fbff7394985cf3ad4618bcecde930d24d74be8529918ad5a2b62
+  metadata.gz: 4ec7994190ada35fdac587e172689dbf5dbac317a81908e9c887ef5b9bcff086
+  data.tar.gz: a7d66b34f986653f8746d27bb6f5831f53ff9c3e4c486a4d55af041421b14b7b
 SHA512:
-  metadata.gz: 5ebe013292fc99265b692e060b5a3041f2b2ef770becb3f53f20eb372ecb7a4f594e51bfa8ee607fcb7c059918f52bca0d334f876a119dbd9d51031aa2eebc63
-  data.tar.gz: f902ca5c94366c979a009bbbfe39cbc3951c06ee18ff27b7ec2c2d177423c07d593e98cc16184e43cef81770cc37398ee96c574226f06cc9019d8061812747ae
+  metadata.gz: 510c48db7df2865b141198ad3f0eb0f14a4a9994e197673b55659558a1b10442cc1d70e159d8a2a49b3ae878c2d6081f99f82182ebca51cea0418bb2c6b988fc
+  data.tar.gz: 0b6b35d3afba2374aa90e204c88cbb2ec850ad3d90169030d48464e7a19f9eece20a678df9ad1a9c1de4107aeba81f0bd1869228a56d840752c1ef4960b9e000

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.15'
-  gem.authors     = ['Satoshi SUZUKI']
-  gem.email       = 'studio3104.com@gmail.com'
-  gem.homepage    = 'https://github.com/studio3104/fluent-plugin-graphite'
+  gem.version     = '0.0.19'
+  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/out_graphite.rb

@@ -6,10 +6,10 @@ module Fluent::Plugin
 
     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
+    config_param :log_level, :string, default: 'info'
 
     def initialize
       super
@@ -24,15 +24,11 @@ module Fluent::Plugin
 
     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.
@@ -43,14 +39,14 @@ module Fluent::Plugin
 
     def format_metrics(tag, record)
       metrics = {}
-      metrics[@monitoring_key + "." + tag] = 1
+      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
@@ -69,27 +65,38 @@ module Fluent::Plugin
       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: "udp://#{@host}:#{@port}",
+        graphite: "tcp://#{@host}:#{@port}",
 
         # Optional: results are aggregated in 60 seconds slices ( default is 60 )
-        slice: 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,
-
-        # 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")
+      init_logger
+      log.info("Starting graphite 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.15
+  version: 0.0.19
 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: []
@@ -82,7 +82,7 @@ files:
 - 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: {}