lib/fluent/plugin/out_woothee.rb in fluent-plugin-woothee-0.1.0 vs lib/fluent/plugin/out_woothee.rb in fluent-plugin-woothee-0.1.1

@@ -20,23 +20,19 @@
 
   config_param :merge_agent_info, :bool, :default => false
   config_param :out_key_name, :string, :default => 'agent_name'
   config_param :out_key_category, :string, :default => 'agent_category'
   config_param :out_key_os, :string, :default => 'agent_os'
+  config_param :out_key_os_version, :string, :default => nil # supress output
   config_param :out_key_version, :string, :default => nil # supress output
   config_param :out_key_vendor, :string, :default => nil # supress output
 
   def initialize
     super
     require 'woothee'
   end
 
-  # Define `log` method for v0.10.42 or earlier
-  unless method_defined?(:log)
-    define_method("log") { $log }
-  end
-
   def configure(conf)
     super
 
     # tag ->
     if not @tag and not @remove_prefix and not @add_prefix
@@ -124,9 +120,10 @@
         record = record.merge({
             @out_key_name => parsed[Woothee::ATTRIBUTE_NAME],
             @out_key_category => parsed[Woothee::ATTRIBUTE_CATEGORY].to_s,
             @out_key_os => parsed[Woothee::ATTRIBUTE_OS]
           })
+        record[@out_key_os_version] = parsed[Woothee::ATTRIBUTE_OS_VERSION] if @out_key_os_version
         record[@out_key_version] = parsed[Woothee::ATTRIBUTE_VERSION] if @out_key_version
         record[@out_key_vendor] = parsed[Woothee::ATTRIBUTE_VENDOR] if @out_key_vendor
       end
       Fluent::Engine.emit(tag, time, record)
     end