fluent-plugin-lm-logs 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b7c2e1fc4c9c42e768327c9dead6b9eaa9f8a77b44ea7697b51306617e2702a
-  data.tar.gz: 4aee4bdb365b8c7efd52c2aa33ed8d5b0f83cb3ca7e551986062721b33faea24
+  metadata.gz: 19349cb3a0b92808dbf10c877ddefd7afae737fd2b643de6fb4c9b44b613dd08
+  data.tar.gz: 5cd7858230f353def6da39d4a3669ff236560149deb0a7ea32f344eb8d67430b
 SHA512:
-  metadata.gz: f96d200ceb54255e82e09248179b442032c96a1f6bf28efeb410a8a5b4f9423ad5c08815f71cc9a47b2f03c9bbaeef258cdfe52b435b168e65cdaa0bb832adbd
-  data.tar.gz: 8dbfcce551188386379bb479021e24dc8b027f6edba4fd0f87ef17ef4eda1535010a0eaf5ca973fda304cfed339a4b0e53306e9fda012336686cc70c75d5b868
+  metadata.gz: 40af1f578e4307a26dce585dd5817f131fcc938cb8a16561441069960950e90a6f5db7abb5af79e091be39ed9f8eab273df33fcc64fc37a71d8d5830e2eabf79
+  data.tar.gz: b14b17c709c137a1b35b7043faa32bde3ede821036d22732de429757e5c70f187b82094069adeefd60a974923d4b1623ea4b0a6b6ce3e6a46b1e1e9d7f0cba4c

data/lib/fluent/plugin/out_lm.rb

@@ -25,9 +25,9 @@ module Fluent
 
     # config_param defines a parameter. You can refer a parameter via @path instance variable
 
-    config_param :access_id,  :string, :default => "access_id"
+    config_param :access_id,  :string, :default => nil
 
-    config_param :access_key,  :string, :default => "access_key"
+    config_param :access_key,  :string, :default => nil, secret: true
 
     config_param :company_name,  :string, :default => "company_name"
 
@@ -49,6 +49,9 @@ module Fluent
 
     config_param :http_proxy,   :string, :default => nil
   
+    # Use bearer token for auth.
+    config_param :bearer_token, :string, :default => nil, secret: true
+
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
     # If the configuration is invalid, raise Fluent::ConfigError.
@@ -60,6 +63,7 @@ module Fluent
     # Open sockets or files here.
     def start
       super
+      configure_auth
       proxy_uri = :ENV
       if @http_proxy
         proxy_uri = URI.parse(http_proxy)
@@ -73,6 +77,17 @@ module Fluent
       @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."
+        @use_bearer_instead_of_lmv1 = true
+      end  
+      if @use_bearer_instead_of_lmv1 && @bearer_token == nil 
+        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
+    end
     # This method is called when shutting down.
     # Shutdown the thread and close sockets or files here.
     def shutdown
@@ -210,15 +225,20 @@ module Fluent
 
 
     def generate_token(events)
-      timestamp = DateTime.now.strftime('%Q')
-      signature = Base64.strict_encode64(
-          OpenSSL::HMAC.hexdigest(
-              OpenSSL::Digest.new('sha256'),
-              @access_key,
-              "POST#{timestamp}#{events.to_json}/log/ingest"
-          )
-      )
-      "LMv1 #{@access_id}:#{signature}:#{timestamp}"
+
+      if @use_bearer_instead_of_lmv1
+        return "Bearer #{@bearer_token}"
+      else  
+        timestamp = DateTime.now.strftime('%Q')
+        signature = Base64.strict_encode64(
+            OpenSSL::HMAC.hexdigest(
+                OpenSSL::Digest.new('sha256'),
+                @access_key,
+                "POST#{timestamp}#{events.to_json}/log/ingest"
+            )
+        )
+        return "LMv1 #{@access_id}:#{signature}:#{timestamp}"
+      end  
     end
   end
 end

data/lib/fluent/plugin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - LogicMonitor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd