fluent-plugin-td-monitoring 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad90baeba24b3228a34f2ab13f64ff939287b96d
-  data.tar.gz: cbbd57ff2acc75bca902cea2f30690d758f0a902
+  metadata.gz: 1df66e714b08d9ff41981893194707794a761c06
+  data.tar.gz: a15c5f5044e29bb570c9c9c3dfbd5e677da01e5d
 SHA512:
-  metadata.gz: 9332967e7dd60d2e6af483c0e47c6364bf38cd943914569c26abc96a1c610d9cc2801ee0ff6a2e114f3fd7b95bc75bb321fe4c8b0bbc48ae73c787095575dda7
-  data.tar.gz: 4349ac2365fd010fa10cdbc7747bec94c5b0108c5374cb6b8b31f601390554f5975075d7cd34c0de9ae10319924e67c8b7f750f9db74a5002e1f2bed926650c6
+  metadata.gz: 5b05bc8792642c72b3b492aabbfce44ca9adfc684799be02658abc1d720f2ed4e989b3734ba023c3d7884274266a862120d6c4204798cdf676c089c8fdaeeb76
+  data.tar.gz: 81c7cee93fd3ec7d40c58a4ff3f3277e11c09ad5f6022631ae4311dbd123f45f50a7631e9ad3b98dd4f9f2c3abef3e3bbfa6c3ff67128f8c02824fadc1cad20d

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2014-12-17 version 0.2.0
+
+  - Support v0.12
+  - Improve buffer metric handling
+
 == 2014-11-14 version 0.1.4
 
   - Update httpclient to 2.4.0

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/fluent-plugin-td-monitoring.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.has_rdoc = false
   gem.required_ruby_version = '>= 1.9.2'
 
-  gem.add_dependency "fluentd", "~> 0.10.33"
+  gem.add_dependency "fluentd", ">= 0.10.33"
   gem.add_dependency "ohai", "~> 6.20.0"
   gem.add_dependency "httpclient", "~> 2.4.0"
   gem.add_development_dependency "rake", ">= 0.9.2"

data/lib/fluent/plugin/in_td_monitor_agent.rb

@@ -1,9 +1,9 @@
 module Fluent
-  require_relative 'fms_fluentd_ext'
+  require_relative 'tdms_ext_fluentd'
   require_relative 'out_td_counter'
 
   class TDMonitorAgentInput < Input
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
 
     Plugin.register_input('td_monitor_agent', self)
 
@@ -204,10 +204,6 @@ module Fluent
       tagged_counts
     end
 
-    def has_metric?(plugin)
-      plugin['output_plugin'] && plugin.has_key?('buffer_queue_length')
-    end
-
     def send_to_tdms(path, info)
       #puts JSON.pretty_generate('agent_id' => @agent_id, 'data' => info, 'time' => Time.now.to_i); return true
       begin

data/lib/fluent/plugin/{fms_fluentd_ext.rb → tdms_ext_fluentd.rb}

@@ -28,27 +28,30 @@ module Fluent
       'buffer_queue_length' => '@buffer.queue_size',
       'buffer_queued_size' => '@buffer.total_queued_chunk_size',
       'emit_count' => '@emit_count',
-      'retry_count' => '@error_history.size'
+      'retry_count' => '@num_errors'
     }
 
     def get_monitor_info(pe, opts = {})
-      obj = {'plugin_id' => pe.id_or_tag_path}
-
-      conf = {}
-      TD_MONITOR_INFO.each_pair { |key, code|
-        begin
-          v = pe.instance_eval(code)
-          unless v.nil?
-            conf[key] = v
-          end
-        rescue
-        end
+      obj = {'plugin_id'.freeze => pe.id_or_tag_path}
+      conf = {
+        'type'.freeze => pe.config['@type'.freeze] || pe.config['type'.freeze],
+        'output_plugin'.freeze => pe.is_a?(::Fluent::Output),
+        'plugin_category'.freeze => plugin_category(pe)
       }
-      obj['config'] = conf
 
-      if conf['output_plugin'] && conf.has_key?('buffer_type')
+      if pe.is_a?(BufferedOutput)
+        TD_MONITOR_INFO.each_pair { |key, code|
+          begin
+            v = pe.instance_eval(code)
+            unless v.nil?
+              conf[key] = v
+            end
+          rescue
+          end
+        }
         obj['metrics'] = get_plugin_metric(pe)
       end
+      obj['config'] = conf
 
       obj
     end
@@ -84,32 +87,66 @@ module Fluent
     end
   end
 
-  class Match
-    alias orig_init initialize
-    attr_reader :pattern_str
+  if defined?(::Fluent::EventRouter) # for v0.12 or later
+    class EngineClass
+      def set_tag_path(prefix = '')
+        rules = @root_agent.event_router.instance_variable_get(:@match_rules)
+        set_tag_path_in_rules(prefix, rules)
 
-    def initialize(pattern_str, output)
-      @pattern_str = pattern_str.dup
-      orig_init(pattern_str, output)
-    end
-  end
+        labels = @root_agent.labels
+        labels.each { |n, label|
+          rules = label.event_router.instance_variable_get(:@match_rules)
+          set_tag_path_in_rules("#{prefix}/#{n}", rules)
+        }
+      end
 
-  class EngineClass
-    def set_tag_path(prefix = '')
-      @matches.each { |m|
-        if m.is_a?(Match)
-          tag_path = "#{prefix}/#{m.pattern_str}"
-          m.output.tag_path = tag_path
-          if m.output.is_a?(MultiOutput) && m.output.respond_to?(:outputs)
-            set_tag_path_to_multi_output(tag_path, m.output)
+      def set_tag_path_in_rules(prefix, rules)
+        rules.each { |rule|
+          tag_path = "#{prefix}/#{rule.pattern_str}"
+          collector = rule.collector
+          if collector.is_a?(Output)
+            collector.tag_path = tag_path
+            if collector.is_a?(MultiOutput) && collector.respond_to?(:outputs)
+              set_tag_path_to_multi_output(tag_path, collector)
+            end
+            if collector.respond_to?(:output) && collector.output.is_a?(Output)
+              set_tag_path_to_wrap_output(tag_path, collector)
+            end
           end
-          if m.output.respond_to?(:output) && m.output.output.is_a?(Output)
-            set_tag_path_to_wrap_output(tag_path, m.output)
+        }
+      end
+    end
+  else # for v0.10
+    class Match
+      alias orig_init initialize
+      attr_reader :pattern_str
+
+      def initialize(pattern_str, output)
+        @pattern_str = pattern_str.dup
+        orig_init(pattern_str, output)
+      end
+    end
+
+    class EngineClass
+      def set_tag_path(prefix = '')
+        @matches.each { |m|
+          if m.is_a?(Match)
+            tag_path = "#{prefix}/#{m.pattern_str}"
+            m.output.tag_path = tag_path
+            if m.output.is_a?(MultiOutput) && m.output.respond_to?(:outputs)
+              set_tag_path_to_multi_output(tag_path, m.output)
+            end
+            if m.output.respond_to?(:output) && m.output.output.is_a?(Output)
+              set_tag_path_to_wrap_output(tag_path, m.output)
+            end
           end
-        end
-      }
+        }
+      end
     end
+  end
 
+  # Helper methods for tag setting
+  class EngineClass
     def set_tag_path_to_multi_output(prefix, multi_output)
       new_prefix = "#{prefix}/#{get_type_from_klass(multi_output.class)}"
       multi_output.outputs.each_with_index { |output, index|

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.33
 - !ruby/object:Gem::Dependency
@@ -108,9 +108,9 @@ files:
 - VERSION
 - data/ca-bundle.crt
 - fluent-plugin-td-monitoring.gemspec
-- lib/fluent/plugin/fms_fluentd_ext.rb
 - lib/fluent/plugin/in_td_monitor_agent.rb
 - lib/fluent/plugin/out_td_counter.rb
+- lib/fluent/plugin/tdms_ext_fluentd.rb
 homepage: http://www.treasuredata.com/
 licenses:
 - MIT