adp-fluent-plugin-graphite 0.0.9 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa50ec531a9210bc6db8fb503f22735efdd04b2d771a552a646342d5752c974
-  data.tar.gz: 1f31d7142c2d56f976f151bffb29dbd04dca62dcc2ebd43a49893189bbbe3190
+  metadata.gz: 2132e7a1254a424751d140529b61db59d0fb83b1a3f7832e3c1298274fca6d48
+  data.tar.gz: 22a3e8ca7de5f2b9c1b8e0ed765256b96955d3e6a9f28abb02a6e4fcf7223727
 SHA512:
-  metadata.gz: 217a1405017590697c07b1c0988f4577d46ec4b3d460c54aea1e78b8832778b106f16740bad61b356c21fcf808bfa771e1d5f2037123ca8579e6b7c51b91c547
-  data.tar.gz: 353e10ed2768774ec4b227bf28db70eb56e4c629bd311a3326f43d8875756ed0d5f430a58284007fab3eca94cb301575140cbef9be71b5f365147b734c8b67dc
+  metadata.gz: f87b59623230b6d2ac2b7d50cb3f2ef812fd8c0482697d3aa9484bfd673f1ee1e9d36d07415c64c4aa1f082b3559b85fe06866977c7c5cd757fd552e7174abe7
+  data.tar.gz: 5e39bee75a4c1d486be3fab422f92a0c71f7758c6ffd9ff4fde0b6a203c387a32bdbc5020681f89fb019c3f6cd5946122ba5573ba98c9cabcf41602198614518

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.9'
+  gem.version     = '0.0.13'
   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
 
@@ -29,48 +29,28 @@ module Fluent::Plugin
       end
     end
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       es.each do |time, record|
         emit_tag = tag.dup
         log.info("Emit graphite plugin: #{record}")
-        next unless metrics = format_metrics(emit_tag, record)
+        metrics = format_metrics(emit_tag, record)
 
         # implemented to immediate call post method in this loop, because graphite-api.gem has the buffers.
         post(metrics, time)
       end
 
-      chain.next
     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_record.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

metadata

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