fluent-plugin-td-monitoring 0.2.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec094e544fe7a168991aa504a01ac71286e62be
-  data.tar.gz: 27b251909dc0ebdcbdfc0724a7ef00c05fc2daaa
+  metadata.gz: 3617cf72d677582e10dcf7cae85badbf4f9164f8
+  data.tar.gz: b066629763a167e9fe70e814d9647524b18637a2
 SHA512:
-  metadata.gz: 69d5c7872866d681fc0a57868349f0d20e9ba55adf66e0c735ab04729717a7bac9451661680f2b85586a80b71730a3fd723b488da12750c83f79db228904fa4d
-  data.tar.gz: db39c35704a9346fd63ac005165ad24820ce6cb72a2d58759fa94c48bad1e2a2ad835fbd69e9b6abaf19d792890f7b026438c52678983acb6043d3705df21a74
+  metadata.gz: e392a0df7ad378881964738e721a19a560e1be4a4894e1a85189530854b5574e9206bc3a0d4f850bc850656fa63c0d2fae4419c737d83135195e6ee9510547a0
+  data.tar.gz: cb3b23a3321e85fe24b232f93c816a5c9939820504dc44c3aa1f12144c7d03754312f75f21bedfc170fabf3763ed3b240c41605905577a9cde3012d7c9b30d22

data/ChangeLog

@@ -1,3 +1,7 @@
+== 2019-04-24 version 1.0.0.
+
+  - Use v1. This is for existing users. TD monitorin will be shutdown.
+
 == 2018-03-26 version 0.2.4
 
   - Fix related gem version to support older ruby

data/VERSION

@@ -1 +1 @@
-0.2.4
+1.0.0

data/lib/fluent/plugin/in_td_monitor_agent.rb

@@ -1,11 +1,13 @@
-module Fluent
+require 'fluent/plugin/input'
+
+module Fluent::Plugin
   require_relative 'tdms_ext_fluentd'
-  require_relative 'out_td_counter'
+  #require_relative 'out_td_counter'
 
   class TDMonitorAgentInput < Input
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
 
-    Plugin.register_input('td_monitor_agent', self)
+    Fluent::Plugin.register_input('td_monitor_agent', self)
 
     config_param :apikey, :string, :secret => true
     config_param :emit_interval, :time, :default => 60
@@ -37,7 +39,7 @@ module Fluent
         @num_call = 0
         @call_interval = interval / 10
         @log = log
-        super(10, repeat)
+        super(5, repeat)
       end
 
       def on_timer
@@ -63,8 +65,6 @@ module Fluent
     end
 
     def start
-      Engine.set_tag_path
-
       @started_at = Time.now.to_i
       @monitor_agent = ExMonitorAgentInput.new
       begin
@@ -78,7 +78,7 @@ module Fluent
         @disable_node_info = true
         log.warn "Failed to get system metrics. Set 'disable_node_info' to true: #{e}"
       end
-      @counters = collect_counters
+      @counters = [] #collect_counters
 
       unless register_instance_info
         log.warn "Can't register instance information at start"

data/lib/fluent/plugin/tdms_ext_fluentd.rb

@@ -1,6 +1,6 @@
-module Fluent
-  require 'fluent/plugin/in_monitor_agent'
+require 'fluent/plugin/in_monitor_agent'
 
+module Fluent::Plugin
   class MonitorAgentInput
     def self.collect_children(pe, array=[])
       array << pe
@@ -17,29 +17,36 @@ module Fluent
 
   class ExMonitorAgentInput < MonitorAgentInput
     TD_MONITOR_INFO = MONITOR_INFO.merge(
-      'buffer_type' => 'buffer_type',
-      'buffer_path' => '@buffer.buffer_path',
-      'flush_interval' => '@flush_interval')
-    %W(plugin_id config buffer_queue_length buffer_total_queued_size retry_count).each { |k|
+      'buffer_type' => '@buffer_config[:@type]',
+      'buffer_path' => '@buffer.path',
+      'flush_interval' => '@buffer_config.flush_interval')
+    %W(plugin_id config buffer_queue_length buffer_total_queued_size retry_count buffer_timekeys).each { |k|
       TD_MONITOR_INFO.delete(k)
     }
 
     TD_PLUGIN_METRIC_INFO = { 
-      'buffer_queue_length' => '@buffer.queue_size',
-      'buffer_queued_size' => '@buffer.total_queued_chunk_size',
-      'emit_count' => '@emit_count',
-      'retry_count' => '@num_errors'
+      'buffer_queue_length' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && !@buffer.nil? && @buffer.is_a?(::Fluent::Plugin::Buffer); @buffer.queue.size },
+      'buffer_queued_size' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && !@buffer.nil? && @buffer.is_a?(::Fluent::Plugin::Buffer); @buffer.stage_size + @buffer.queue_size },
+      'emit_count' => ->(){ @emit_count },
+      'retry_count' => ->(){
+        throw(:skip) unless instance_variable_defined?(:@buffer) && !@buffer.nil? && @buffer.is_a?(::Fluent::Plugin::Buffer)
+        begin
+          @retry ? @retry.steps : 0
+        rescue
+          0
+        end
+      },
     }
 
     def get_monitor_info(pe, opts = {})
-      obj = {'plugin_id'.freeze => pe.id_or_tag_path}
+      obj = {'plugin_id'.freeze => pe.plugin_id}
       conf = {
         'type'.freeze => pe.config['@type'.freeze] || pe.config['type'.freeze],
-        'output_plugin'.freeze => pe.is_a?(::Fluent::Output),
+        'output_plugin'.freeze => pe.is_a?(::Fluent::Plugin::Output),
         'plugin_category'.freeze => plugin_category(pe)
       }
 
-      if pe.is_a?(BufferedOutput)
+      if pe.is_a?(::Fluent::Plugin::Output) && pe.instance_variable_get(:@buffering)
         TD_MONITOR_INFO.each_pair { |key, code|
           begin
             v = pe.instance_eval(code)
@@ -60,7 +67,7 @@ module Fluent
       metrics = {}
       TD_PLUGIN_METRIC_INFO.each_pair { |key, code|
         begin
-          v = pe.instance_eval(code)
+          v = pe.instance_exec(&code)
           unless v.nil?
             metrics[key] = {'value' => v}
           end
@@ -69,9 +76,9 @@ module Fluent
       }
 
       # set each configruration limit
-      buffer_queue_limit = pe.instance_eval('@buffer.buffer_queue_limit')
-      metrics['buffer_queue_length']['max'] = buffer_queue_limit
-      metrics['buffer_queued_size']['max'] = buffer_queue_limit * pe.instance_eval('@buffer.buffer_chunk_limit')
+      total_size = pe.instance_eval('@buffer.total_limit_size')
+      metrics['buffer_queue_length']['max'] = total_size / pe.instance_eval('@buffer.chunk_limit_size')
+      metrics['buffer_queued_size']['max'] = total_size
 
       metrics
     end
@@ -86,91 +93,4 @@ module Fluent
       @id ? @id : @tag_path ? @tag_path : "object:#{object_id.to_s(16)}"
     end
   end
-
-  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)
-
-        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
-
-      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
-        }
-      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
-
-  # 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|
-        set_tag_path_to_output("#{new_prefix}.#{index}", output)
-      }
-    end
-
-    def set_tag_path_to_wrap_output(prefix, wrap_output)
-      new_prefix = "#{prefix}/#{get_type_from_klass(wrap_output.class)}"
-      set_tag_path_to_output(new_prefix, wrap_output.output)
-    end
-
-    def set_tag_path_to_output(prefix, output)
-      if output.is_a?(MultiOutput)
-        set_tag_path_to_multi_output(prefix, output)
-      else
-        output.tag_path = "#{prefix}/#{get_type_from_klass(output.class)}"
-      end
-    end
-
-    def get_type_from_klass(klass)
-      Plugin.instance_variable_get(:@output).each { |name, output|
-        return name if output == klass
-      }
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd