fluent-plugin-td-monitoring 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dedbe525edc4681d73f72d20ac3c326e935298a1
-  data.tar.gz: 01bb7314e6d6246252dcdf118861e46e33eba070
+  metadata.gz: 5ed61bb451c1d0809858044aaa984161f11f63d5
+  data.tar.gz: 844db9811febcad867500a8db5bd95659426dc74
 SHA512:
-  metadata.gz: fe3e49c87aaab1fb782a95134ccbc7eca030e62d72a111a826ebc652536db4009865da991af7597eb5a9806fb76586f85875f4416cedaadb8d57e84221effb17
-  data.tar.gz: 3754c5dd617a386869a2c8bf12b4092519ac1fb19ea7f7ecd2c451d0a43c4be56830167f216e0ef32bd7603d86425927b20bee2f8b252f7db7474f4017e68dde
+  metadata.gz: 15eb5bab5dcd9dde7d8dfd9983b8e23ca18cf58eca5f6a75e3a5d74e9d15b0651392b5454e3d139cd9ba407ab4693b66050130dd89ce6b6400ee60174fa6f110
+  data.tar.gz: 4e20e2acca0e8c3435b5072e8b056f5e73b1ddab37f43ca630037b025b7023d796d3f29bcf85fb56cd2074f8a82cd4094e0b14a1fcfb44762c58740935bacab5

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2014-06-06 version 0.1.2
+
+  - support log_level option
+  - disable_node_info is true by default
+
 == 2014-03-09 version 0.1.1
 
   - Catch an exception when can't get system metrics

data/README.md

@@ -99,7 +99,7 @@ $ git clone git@github.com:treasure-data/fluent-plugin-td-monitoring.git
 $ cd fluent-plugin-td-monitoring
 $ bundle install
 $ bundle exec rake build
-$ gem install pkg/fluent-plugin-td-monitoring-0.1.1.gem
+$ gem install pkg/fluent-plugin-td-monitoring-0.1.2.gem
 $ fluentd -c fluentd.conf
 ```
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/fluent/plugin/in_td_monitor_agent.rb

@@ -3,7 +3,7 @@ module Fluent
   require_relative 'out_td_counter'
 
   class TDMonitorAgentInput < Input
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
 
     Plugin.register_input('td_monitor_agent', self)
 
@@ -17,7 +17,11 @@ module Fluent
     config_param :read_timeout, :integer, :default => 10
     config_param :send_timeout, :integer, :default => 10
 
-    config_param :disable_node_info, :bool, :default => false
+    config_param :disable_node_info, :bool, :default => true
+
+    unless method_defined?(:log)
+      define_method(:log) { $log }
+    end
 
     def initialize
       super
@@ -27,11 +31,12 @@ module Fluent
     end
 
     class TimerWatcher < Coolio::TimerWatcher
-      def initialize(interval, repeat, &callback)
+      def initialize(interval, repeat, log, &callback)
         @callback = callback
         # Avoid long shutdown time
         @num_call = 0
         @call_interval = interval / 10
+        @log = log
         super(10, repeat)
       end
 
@@ -42,8 +47,8 @@ module Fluent
           @callback.call
         end
       rescue => e
-        $log.error e.to_s
-        $log.error_backtrace
+        @log.error e.to_s
+        @log.error_backtrace
       end
     end
 
@@ -70,22 +75,22 @@ module Fluent
         end
       rescue => e
         @disable_node_info = true
-        $log.warn "Failed to get system metrics. Set 'disable_node_info' to true: #{e}"
+        log.warn "Failed to get system metrics. Set 'disable_node_info' to true: #{e}"
       end
       @counters = collect_counters
 
       unless register_instance_info
-        $log.warn "Can't register instance information at start"
+        log.warn "Can't register instance information at start"
       end
 
       @loop = Coolio::Loop.new
-      @timer = TimerWatcher.new(@emit_interval, true, &method(:on_timer))
+      @timer = TimerWatcher.new(@emit_interval, true, log, &method(:on_timer))
       @loop.attach(@timer)
       @thread = Thread.new(&method(:run))
     end
 
     def shutdown
-      $log.info "shutdown td_monitor_agent plugin"
+      log.info "shutdown td_monitor_agent plugin"
 
       @loop.watchers.each {|w| w.detach }
       @loop.stop
@@ -95,8 +100,8 @@ module Fluent
     def run
       @loop.run
     rescue => e
-      $log.error "unexpected error", :error=> e.to_s
-      $log.error_backtrace
+      log.error "unexpected error", :error=> e.to_s
+      log.error_backtrace
     end
 
     EVENT_ENDPOINT_PATH = '/v1/monitoring/start'
@@ -108,7 +113,7 @@ module Fluent
         end
         sleep 2
       }
-      $log.error "Send instance metrics failed. Try next #{@emit_interval} seconds"
+      log.error "Send instance metrics failed. Try next #{@emit_interval} seconds"
     end
 
     private
@@ -202,11 +207,11 @@ module Fluent
       begin
         res = post(path, info)
         unless res.code.to_s.start_with?('2')
-          $log.warn "Get an error response: code = #{res.code}, message = #{res.body}"
+          log.warn "Get an error response: code = #{res.code}, message = #{res.body}"
           return false
         end
       rescue => e
-        $log.warn "Failed to send metrics: error = #{e.to_s}"
+        log.warn "Failed to send metrics: error = #{e.to_s}"
         return false
       end
       true
@@ -247,7 +252,7 @@ module Fluent
     end
 
     def new_client(opts = {})
-      client = HTTPClient.new(@http_proxy, "FMS Agent #{VERSION}")
+      client = HTTPClient.new(@http_proxy, "TDMS Agent #{VERSION}")
       client.connect_timeout = @connect_timeout
       client.receive_timeout = @read_timeout
       client.send_timeout = @send_timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ''