fluent-plugin-coralogix 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2679f633f12acacc7a6df89e6ee390174f3c0218e8a0257a4f6ce04becc303
-  data.tar.gz: a8eb5b2d6c736b3e262a5d2bbfb41b2625d29414b64d7e92f139a4a76af7b018
+  metadata.gz: ade24fd56923cdeef1a0f2c67326b96845c70a1c30a6a31b1c9d1cc8b8324a63
+  data.tar.gz: d74252467309c8a9ed77de3e002b9dec8345c61e6e452bc929a24d048e5d8934
 SHA512:
-  metadata.gz: 4f3d283bc07e3519fa00ca98b2172090ff9f5c9545a729d1cd116ec3917a1205ad23a5ec00de8e088fa1a486504ab7cdc5c46d04df099e610a556deb27f03187
-  data.tar.gz: a4eb11b58b4f0022c46a7cf985437eb25b52a215f37f0be49cc350566101d51e1ff4d7dcde4b31f61a674e239facf3e6abecf04f9c34ecaacc7b20915e8b8cbd
+  metadata.gz: a986b00fceeb1981307e1cea165abc39a36419e6bd6ec2f109ad8baea702e8925dc334e38aebc60e10d28ac8b58c9da077668bb48b324947b8ed36a62627b6c7
+  data.tar.gz: dd481eae2b188d5b591c07dbde93232247a928fc2225f3ce88c4b298c583e937281947aa8d423841f68d2bf7cbbe12135ab08a3de260001627098a71c9d45853

data/lib/fluent/plugin/out_coralogix.rb

@@ -13,37 +13,61 @@ 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 :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
-    config_param :subsystemname, :string
-    config_param :is_json, :bool, :default => false
+    config_param :appname, :string, :default => ""
+    config_param :subsystemname, :string, :default => ""
+    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
-    @configured = false
-
+    config_param :number_of_workers, :integer, :default => 1
+    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
 
     # 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?("$")
-          @logger = CoralogixLogger.new privatekey, appname, subsystemname, debug, "FluentD (#{version?})", force_compression
-          @configured = true
+        @currentWorker = 0;
+        @workers = {}
+        @app_name_from_config = DEFAULT_appname;
+        @sub_name_from_config = DEFAULT_subsystemname;
+        i = 0
+        $log.info "configure #{number_of_workers} workers"
+        until i == number_of_workers do
+          @workers[i.to_s] = {}
+          $log.info "init worker ##{i}"
+          private_key = get_private_key
+          if !appname.start_with?("$") && !subsystemname.start_with?("$")
+            @app_name_from_config = config.fetch("APP_NAME", appname)
+            @sub_name_from_config = config.fetch("SUB_SYSTEM", subsystemname)
+            @workers[i.to_s]["#{@app_name_from_config}.#{@sub_name_from_config}"] = CoralogixLogger.new private_key, @app_name_from_config, @sub_name_from_config, debug, "FluentD (#{version?})", force_compression, proxy ? proxy.to_h.map { |k,v| [k.to_s,v] }.to_h : Hash.new
+          else
+            @workers[i.to_s] = {}
+          end
+          i+=1
         end
+
       rescue Exception => e
         $log.error "Failed to configure: #{e}"
       end
     end
 
+    def get_private_key
+      return config.fetch("PRIVATE_KEY", privatekey)
+    end
+
     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
 
@@ -52,7 +76,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
@@ -70,16 +94,26 @@ module Fluent
     end
 
     def get_logger(record)
-
-      return @logger if @configured
-      
-      app_name, sub_name = get_app_sub_name(record)
+      private_key = get_private_key
+      if !appname.start_with?("$") && !subsystemname.start_with?("$")
+        app_name = @app_name_from_config
+        sub_name = @sub_name_from_config
+      else
+        app_name, sub_name = get_app_sub_name(record)
+      end
       
-      if !@loggers.key?("#{app_name}.#{sub_name}")
-        @loggers["#{app_name}.#{sub_name}"] = CoralogixLogger.new privatekey, app_name, sub_name
+      # YK@2020-11-26T10:56 - We had encountered a case in which this value reached above 7K and the value of worker became null
+      if @currentWorker >= number_of_workers
+        @currentWorker = 0
+      end
+      worker = @workers[@currentWorker.to_s]
+      @currentWorker+=1;
+      if !worker.key?("#{app_name}.#{sub_name}")
+        worker["#{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}"]
+      return worker["#{app_name}.#{sub_name}"]
+      
     end
 
 
@@ -102,7 +136,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
@@ -110,17 +144,17 @@ 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
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-coralogix
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Royee Goldberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: centralized_ruby_logger
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.15
 description: Coralogix Fluentd plugin to send logs to Coralogix server.
 email: royee@coralogix.com
 executables: []
@@ -35,7 +35,7 @@ homepage: http://www.coralogix.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -50,9 +50,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.3
+signing_key:
 specification_version: 4
 summary: Coralogix Fluentd out plugin
 test_files: []