fluent-plugin-lm-logs 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19349cb3a0b92808dbf10c877ddefd7afae737fd2b643de6fb4c9b44b613dd08
-  data.tar.gz: 5cd7858230f353def6da39d4a3669ff236560149deb0a7ea32f344eb8d67430b
+  metadata.gz: e2f2d379ca3023506ac1e1781ae37e44bdd57558894d7f9ee743c6d9d823894c
+  data.tar.gz: 8a88cc0984177c019f1b357ab2d72a8d8d956cb73683b48bb0e4bf0e71f4c56f
 SHA512:
-  metadata.gz: 40af1f578e4307a26dce585dd5817f131fcc938cb8a16561441069960950e90a6f5db7abb5af79e091be39ed9f8eab273df33fcc64fc37a71d8d5830e2eabf79
-  data.tar.gz: b14b17c709c137a1b35b7043faa32bde3ede821036d22732de429757e5c70f187b82094069adeefd60a974923d4b1623ea4b0a6b6ce3e6a46b1e1e9d7f0cba4c
+  metadata.gz: 5b72a7ca3c7cfdc2179244cdd82ee7f830f63c98a145b61bb5e5140d8d00dfa6ec0307d422546e5e33fc94106e32aaaa624936a02df83aef4d33b063292fba07
+  data.tar.gz: 2a9928406e7c5bfb460e15ef22df5b1d3f711aca6bcc171e95aa3ba663b59bae123cdd5e3a168b5a9887b4d8bb798e6188ec08181601f8a07424461a5b86e7b0

data/README.md

@@ -66,6 +66,7 @@ See the [LogicMonitor Helm repository](https://github.com/logicmonitor/k8s-helm-
 | `resource_mapping` | The mapping that defines the source of the log event to the LM resource. In this case, the `<event_key>` in the incoming event is mapped to the value of `<lm_property>`.|
 | `access_id` | LM API Token access ID. |
 | `access_key` | LM API Token access key. |
+| `bearer_token` | LM API Bearer Token. Either specify `access_id` and `access_key` both or `bearer_token`. If all specified, LMv1 token(`access_id` and `access_key`) will be used for authentication with Logicmonitor.   |
 | `flush_interval` | Defines the time in seconds to wait before sending batches of logs to LogicMonitor. Default is `60s`. |
 | `debug` | When `true`, logs more information to the fluentd console. |
 | `force_encoding` | Specify charset when logs contains invalid utf-8 characters. |

data/Rakefile

@@ -3,5 +3,6 @@ require "rake/testtask"
 task default: "test"
 
 Rake::TestTask.new do |task|
- task.pattern = "test/plugin/*.rb"
-end
+ task.libs << "test"
+ task.test_files = Dir.glob('test/plugin/*.rb') - ['test/plugin/test_performance.rb']
+end

data/lib/fluent/plugin/out_lm.rb

@@ -36,7 +36,7 @@ module Fluent
     config_param :debug,  :bool, :default => false
 
     config_param :include_metadata,  :bool, :default => false
-		
+
     config_param :force_encoding,  :string, :default => ""
 
     config_param :compression,  :string, :default => ""
@@ -48,7 +48,7 @@ module Fluent
     config_param :device_less_logs,  :bool, :default => false
 
     config_param :http_proxy,   :string, :default => nil
-  
+
     # Use bearer token for auth.
     config_param :bearer_token, :string, :default => nil, secret: true
 
@@ -59,6 +59,10 @@ module Fluent
       super
     end
 
+    def multi_workers_ready?
+      true
+    end
+
     # This method is called when starting.
     # Open sockets or files here.
     def start
@@ -79,11 +83,11 @@ module Fluent
 
     def configure_auth
       @use_bearer_instead_of_lmv1 = false
-      if @access_id == nil || @access_key == nil
-        log.info "Access Id or access key null. Using bearer token for authentication."
+      if is_blank(@access_id) || is_blank(@access_key)
+        log.info "Access Id or access key blank / null. Using bearer token for authentication."
         @use_bearer_instead_of_lmv1 = true
-      end  
-      if @use_bearer_instead_of_lmv1 && @bearer_token == nil 
+      end
+      if @use_bearer_instead_of_lmv1 && is_blank(@bearer_token)
         log.error "Bearer token not specified. Either access_id and access_key both or bearer_token must be specified for authentication with Logicmonitor."
         raise ArgumentError, 'No valid authentication specified. Either access_id and access_key both or bearer_token must be specified for authentication with Logicmonitor.'
       end
@@ -150,7 +154,7 @@ module Fluent
         else
           lm_event[DEVICELESS_KEY_SERVICE] = encode_if_necessary(record[DEVICELESS_KEY_SERVICE])
           if record[DEVICELESS_KEY_NAMESPACE]!=nil
-            lm_event[DEVICELESS_KEY_NAMESPACE] = encode_if_necessary(record[DEVICELESS_KEY_NAMESPACE]) 
+            lm_event[DEVICELESS_KEY_NAMESPACE] = encode_if_necessary(record[DEVICELESS_KEY_NAMESPACE])
           end
         end
       end
@@ -167,13 +171,13 @@ module Fluent
     end
 
     def get_metadata(record)
-      #if encoding is not defined we will skip going through each key val 
+      #if encoding is not defined we will skip going through each key val
       #and return the whole record for performance reasons in case of a bulky record.
-      if @force_encoding == "" 
+      if @force_encoding == ""
         return record
       else
         lm_event = {}
-        record.each do |key, value| 
+        record.each do |key, value|
           lm_event["#{key}"] = get_encoded_string(value)
         end
         return lm_event
@@ -194,7 +198,7 @@ module Fluent
 
     def send_batch(events)
       body = events.to_json
-      
+
       if @debug
         log.info "Sending #{events.length} events to logic monitor at #{@url}"
         log.info "Request json #{body}"
@@ -218,7 +222,7 @@ module Fluent
       end
 
       resp = @http_client.request @uri, request
-      if @debug || resp.kind_of?(Net::HTTPMultiStatus) || !resp.kind_of?(Net::HTTPSuccess) 
+      if @debug || resp.kind_of?(Net::HTTPMultiStatus) || !resp.kind_of?(Net::HTTPSuccess)
         log.info "Status code:#{resp.code} Request Id:#{resp.header['x-request-id']} message:#{resp.body}"
       end
     end
@@ -228,7 +232,7 @@ module Fluent
 
       if @use_bearer_instead_of_lmv1
         return "Bearer #{@bearer_token}"
-      else  
+      else
         timestamp = DateTime.now.strftime('%Q')
         signature = Base64.strict_encode64(
             OpenSSL::HMAC.hexdigest(
@@ -238,7 +242,16 @@ module Fluent
             )
         )
         return "LMv1 #{@access_id}:#{signature}:#{timestamp}"
-      end  
+      end
+    end
+
+    def is_blank(str)
+      if str.nil? || str.to_s.strip.empty?
+        return true
+      else
+        return false
+      end
     end
+
   end
-end
+end

data/lib/fluent/plugin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LmLogsFluentPlugin
-    VERSION = '1.1.0'
-end
+    VERSION = '1.2.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - LogicMonitor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: LogicMonitor logs fluentd output plugin