fluent-plugin-lm-logs 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d615e41f382455dbcae73e2449a311c57bf2a9acc24e55d27127737e162a9469
-  data.tar.gz: e789739f1b6407674a89cb0fe6f54a91c5fdd6936158952113b53d5bf0f0a6fd
+  metadata.gz: 19349cb3a0b92808dbf10c877ddefd7afae737fd2b643de6fb4c9b44b613dd08
+  data.tar.gz: 5cd7858230f353def6da39d4a3669ff236560149deb0a7ea32f344eb8d67430b
 SHA512:
-  metadata.gz: c99d630c5cf20b75afd1759ca6628dbe833e3cd3ff2d98c481651295f4dc8bae538e72dbf7f35acddcf23643385fc76e3463df35c9adb39494e2140987568733
-  data.tar.gz: 74d559060251b796f8ed252eab5a3df58daddf9f0cc467cefc266ff4f7b4f2944026390292b938eb8248c9cb07bd3f4abc0a039ba6c40dafb77109ad4a3fd9c1
+  metadata.gz: 40af1f578e4307a26dce585dd5817f131fcc938cb8a16561441069960950e90a6f5db7abb5af79e091be39ed9f8eab273df33fcc64fc37a71d8d5830e2eabf79
+  data.tar.gz: b14b17c709c137a1b35b7043faa32bde3ede821036d22732de429757e5c70f187b82094069adeefd60a974923d4b1623ea4b0a6b6ce3e6a46b1e1e9d7f0cba4c

data/README.md

@@ -71,6 +71,7 @@ See the [LogicMonitor Helm repository](https://github.com/logicmonitor/k8s-helm-
 | `force_encoding` | Specify charset when logs contains invalid utf-8 characters. |
 | `include_metadata` | When `true`, appends additional metadata to the log. default `false`.  |
 | `device_less_logs` | When `true`, do not map log with any resource. record must have `service` when `true`. default `false`. |
+| `http_proxy` | http proxy string eg. `http://user:pass@proxy.server:port`. Default `nil`  |
 
 
 

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"
 
@@ -46,7 +46,12 @@ module Fluent
     config_param :version_id,  :string, :default => "version_id"
 
     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
+
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
     # If the configuration is invalid, raise Fluent::ConfigError.
@@ -58,13 +63,31 @@ module Fluent
     # Open sockets or files here.
     def start
       super
-      @http_client = Net::HTTP::Persistent.new name: "fluent-plugin-lm-logs"
+      configure_auth
+      proxy_uri = :ENV
+      if @http_proxy
+        proxy_uri = URI.parse(http_proxy)
+      elsif ENV['HTTP_PROXY'] || ENV['http_proxy']
+        log.info("Using HTTP proxy defined in environment variable")
+      end
+      @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"
       @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
@@ -195,23 +218,27 @@ module Fluent
       end
 
       resp = @http_client.request @uri, request
-
-      if @debug || (!resp.kind_of? Net::HTTPSuccess)
-        log.info "Status code:#{resp.code} Request Id:#{resp.header['x-request-id']}"
+      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
 
 
     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.5'
+    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.5
+  version: 1.1.0
 platform: ruby
 authors:
 - LogicMonitor
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -65,7 +65,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/logicmonitor/lm-logs-fluentd
   documentation_uri: https://www.rubydoc.info/gems/lm-logs-fluentd
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: LogicMonitor logs fluentd output plugin
 test_files: []