adp-fluent-plugin-graphite 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ccc0434567a05d9a3845e7addddd73b4ba7c4fc7b5a5d048975c704b33a09c6
-  data.tar.gz: 2fbb1d973ff684abbcb9e6698dc9c14815425b481b7ada47bba9d75eae8d8c68
+  metadata.gz: 3d7ea3516d03ae9df0d626c97453daa20ca97c86491e4ebbeb47bdf8bb0a95e3
+  data.tar.gz: f306f5437dd3fbff7394985cf3ad4618bcecde930d24d74be8529918ad5a2b62
 SHA512:
-  metadata.gz: 6f41e09278d517a79fc9d004eafaea6cab4b4ac72d8e5cef27ead3cdf51de27b2dca8bb9e65c9c7d43b9748b0bb71037177b96b28c72df1cf94e69187d19f361
-  data.tar.gz: 79e3fe164b2bcb206b4d2e5e8a777557f372db0fd86afd4a46e29868eb47205e7ba2da69f79d0dd0efe083dda003f08de937d1e14d965c59d0377a0e0527112f
+  metadata.gz: 5ebe013292fc99265b692e060b5a3041f2b2ef770becb3f53f20eb372ecb7a4f594e51bfa8ee607fcb7c059918f52bca0d334f876a119dbd9d51031aa2eebc63
+  data.tar.gz: f902ca5c94366c979a009bbbfe39cbc3951c06ee18ff27b7ec2c2d177423c07d593e98cc16184e43cef81770cc37398ee96c574226f06cc9019d8061812747ae

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.11'
+  gem.version     = '0.0.15'
   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

@@ -7,7 +7,7 @@ module Fluent::Plugin
     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 :monitoring_key, :string
     config_param :name_key_pattern, :string, default: nil
     config_param :max_retries, :integer, default: 3
 
@@ -33,44 +33,24 @@ module Fluent::Plugin
       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.
-        post(emit_tag, time)
+        post(metrics, time)
       end
 
     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
-
-      return nil if filtered_r
-
-      ecord.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[@monitoring_key + "." + tag] = 1
       metrics
     end
 
-    def post(metrics, time)
+    def post(metric, time)
       trial ||= 1
-      @client.metrics(metrics, time)
-      log.warn("Sending metrics: #{metrics}")
+      @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
@@ -90,7 +70,25 @@ module Fluent::Plugin
     end
 
     def connect_client!
-      @client = GraphiteAPI.new(graphite: "#{@host}:#{@port}")
+      options = {
+        # Required: valid URI {udp,tcp}://host:port/?timeout=seconds
+        graphite: "udp://#{@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

metadata

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