fluent-plugin-coralogix 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0464583b2b032b742f4f575419787d97d9517cad54969ba205445c587fcb9f84'
-  data.tar.gz: 1a3ecf5ce8ce9da3d4198093c9799c9fd42c824d2c54dade646479229bcdee48
+  metadata.gz: 1ce2acecdd79fb16064e42482203fecf190d0e85909b08059b6fd79c001e38fb
+  data.tar.gz: 8443396fbcb5ac930e899878410e447c782a12c556fc1df19b0864f2fd31ddb8
 SHA512:
-  metadata.gz: abfd5e328bc35e658b351ac878faed181b4a3e8c1de71d657b8c3d131a00569db9b2a43eb77201875d7d0c238b1f92af7ad997c0da21e068fbc8cdd60851f2b5
-  data.tar.gz: d8bed1800f225ae9cb04a34ada5321f25baf37d8c397216bcab10fad5bd79aa7d5427b91ce7308eafad484e235f780995f315b66ccc963a6afc6b993e9e49c0a
+  metadata.gz: d0423e9052c876066007afc1137ed0ce103ef86120ac4a7bbdb3b2cd5d91db59c70c3d9d4fffc818b5ca9b9a4711fed288fbe19c9604ee5416408abe8e5c5d54
+  data.tar.gz: 5acf5d83bb67a338fc4bc8845515344d5f923a8bbe5c980a6f2093388befecadcf37229be15639b449622bf0722d871c18bc4d158da809ee7e4be17887cc85ba

data/lib/fluent/plugin/out_coralogix.rb

@@ -13,31 +13,36 @@ module Fluent
     # First, register the plugin. NAME is the name of this plugin
     # and identifies the plugin in the configuration file.
     Fluent::Plugin.register_output('coralogix', self)
-    config_param :config, :hash, :default => {}
-    config_param :log_key_name, :string, :default => nil
+    config_param :config, :hash, :default => {}, deprecated: "This parameter is deprecated"
     config_param :privatekey, :string, :default => nil
     config_param :appname, :string, :default => ""
     config_param :subsystemname, :string, :default => ""
-    config_param :is_json, :bool, :default => false
+    config_param :log_key_name, :string, :default => nil
     config_param :timestamp_key_name, :default => nil
+    config_param :is_json, :bool, :default => false
     config_param :force_compression, :bool, :default => false
     config_param :debug, :bool, :default => false
+    config_section :proxy, :param_name => "proxy", required: false, multi: false do
+      config_param :host, :string
+      config_param :port, :integer
+      config_param :user, :string, :default =>  nil
+      config_param :password, :string, :default =>  nil, secret: true
+    end
     @configured = false
 
-
     # This method is called before starting.
     def configure(conf)
       super
       begin
         @loggers = {}
-       
+
         #If config parameters doesn't start with $ then we can configure Coralogix logger now.
         if !appname.start_with?("$") && !subsystemname.start_with?("$")
+          private_key = get_private_key
           app_name = config.fetch("APP_NAME", appname)
           sub_name = config.fetch("SUB_SYSTEM", subsystemname)
-          private_key = get_private_key
-          
-          @logger = CoralogixLogger.new private_key, app_name, sub_name, debug, "FluentD (#{version?})", force_compression
+
+          @logger = CoralogixLogger.new private_key, app_name, sub_name, debug, "FluentD (#{version?})", force_compression, proxy ? proxy.to_h.map { |k,v| [k.to_s,v] }.to_h : Hash.new
           @configured = true
         end
       rescue Exception => e
@@ -51,9 +56,9 @@ module Fluent
 
     def version?
       begin
-          Gem.loaded_specs['fluent-plugin-coralogix'].version.to_s
-      rescue Exception => e  
-          return '0.0.0'
+        Gem.loaded_specs['fluent-plugin-coralogix'].version.to_s
+      rescue Exception => e
+        return '0.0.0'
       end
     end
 
@@ -62,7 +67,7 @@ module Fluent
         res = record
         return key unless key.start_with?("$")
         key[1..-1].split(".").each do |k|
-          res = res.fetch(k,nil)
+          res = res.fetch(k, nil)
           return default if res == nil
         end
         return res
@@ -82,12 +87,12 @@ module Fluent
     def get_logger(record)
 
       return @logger if @configured
-      
+
       private_key = get_private_key
       app_name, sub_name = get_app_sub_name(record)
-      
+
       if !@loggers.key?("#{app_name}.#{sub_name}")
-        @loggers["#{app_name}.#{sub_name}"] = CoralogixLogger.new private_key, app_name, sub_name
+        @loggers["#{app_name}.#{sub_name}"] = CoralogixLogger.new private_key, app_name, sub_name, debug, "FluentD (#{version?})", force_compression, proxy ? proxy.to_h.map { |k, v| [k.to_s, v] }.to_h : Hash.new
       end
 
       return @loggers["#{app_name}.#{sub_name}"]
@@ -113,7 +118,7 @@ module Fluent
     # NOTE! This method is called by Fluentd's main thread so you should not write slow routine here. It causes Fluentd's performance degression.
     def emit(tag, es, chain)
       chain.next
-      es.each {|time,record|
+      es.each { |time, record|
         logger = get_logger(record)
 
         log_record = log_key_name != nil ? record.fetch(log_key_name, record) : record
@@ -121,15 +126,15 @@ module Fluent
         log_record = log_record.to_s.empty? ? record : log_record
 
         timestamp = record.fetch(timestamp_key_name, nil)
-        if(timestamp.nil?)
+        if (timestamp.nil?)
           logger.debug log_record
         else
           begin
             float_timestamp = DateTime.parse(timestamp.to_s).to_time.to_f * 1000
-            logger.debug log_record, nil, timestamp:float_timestamp
-          rescue Exception => e  
+            logger.debug log_record, nil, timestamp: float_timestamp
+          rescue Exception => e
             logger.debug log_record
-          end          
+          end
         end
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-coralogix
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Royee Goldberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: centralized_ruby_logger