fluent-plugin-lm-logs 1.2.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9029af24ba774f88379606844f5faabf062c5bfe4df7f47386dccd72ceb62217
-  data.tar.gz: e2418db14714305e3cec4103255d9ee86a28b2abfdecceb35ec2976b0b78858d
+  metadata.gz: b0760c2ab48870f18a21e0fe7de74686f71ab108936850c68d61eb6d87d614d8
+  data.tar.gz: a26aaf13e4a5caf38add3d592927f94127a962fba8be340e6f42aef904992a6a
 SHA512:
-  metadata.gz: f63f0f6a27956cbd08bc8272fcbaebd50f93fd2338b4f17ea9480f2ab35579b86078a8d422476e235dbf6c8e3e014c022158bca72ce6e621399f6d724db95ed0
-  data.tar.gz: 3abdc791dceb1d87407004537ad6f4ec1e40bf730aea9680f4124846d6eb506c9e14817a57a7da8c26af2b01894a9f8353489ad2d6ecfbf6297972f93a028f84
+  metadata.gz: a48d16e49022f749a51fb908903a68c360001524867d73887b9296e78d67061cff935207542e594b963bafbe60bb47b528e0a807dbaba2433b477132f8c512a9
+  data.tar.gz: 01ee33b6e727f85af1b755915402f71888344c3f75a8692a23f4a7593af04789bfa441fab057585eb30052025b6a43f80d9d5c76b1e493f9d99f8470fa03e9b4

data/README.md

@@ -22,6 +22,7 @@ Create a custom `fluent.conf` or edit the existing one to specify which logs sho
     @type lm
     resource_mapping {"<event_key>": "<lm_property>"}
     company_name <lm_company_name>
+    company_domain <lm_company_domain>
 	access_id <lm_access_id>
     access_key <lm_access_key>
       <buffer>
@@ -63,6 +64,7 @@ See the [LogicMonitor Helm repository](https://github.com/logicmonitor/k8s-helm-
 | Property | Description |
 | --- | --- |
 | `company_name` | LogicMonitor account name. |
+| `company_domain` | LogicMonitor account domain. For eg. for url test.logicmonitor.com, company_domain is logicmonitor.com . Default is `logicmonitor.com`. |
 | `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. |

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

@@ -49,6 +49,8 @@ module Fluent
 
     config_param :http_proxy,   :string, :default => nil
 
+    config_param :company_domain ,  :string, :default => "logicmonitor.com"
+
     # Use bearer token for auth.
     config_param :bearer_token, :string, :default => nil, secret: true
 
@@ -77,17 +79,17 @@ module Fluent
       @http_client = Net::HTTP::Persistent.new name: "fluent-plugin-lm-logs", proxy: proxy_uri
       @http_client.override_headers["Content-Type"] = "application/json"
       @http_client.override_headers["User-Agent"] = log_source + "/" + LmLogsFluentPlugin::VERSION
-      @url = "https://#{@company_name}.logicmonitor.com/rest/log/ingest"
+      @url = "https://#{@company_name}.#{@company_domain}/rest/log/ingest"
       @uri = URI.parse(@url)
     end
 
     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
+      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
@@ -244,5 +246,14 @@ module Fluent
         return "LMv1 #{@access_id}:#{signature}:#{timestamp}"
       end
     end
+
+    def is_blank(str)
+      if str.nil? || str.to_s.strip.empty?
+        return true
+      else
+        return false
+      end
+    end
+
   end
 end

data/lib/fluent/plugin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.3
 platform: ruby
 authors:
 - LogicMonitor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2024-09-19 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.16
 signing_key:
 specification_version: 4
 summary: LogicMonitor logs fluentd output plugin