fluent-plugin-lm-logs 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ceac6a53b86efe8123cd6ec143d4839de6043815ebb10e763e2b3019122396
-  data.tar.gz: f72441fc5646c2cdc6f602f066fca505e1bb713371a90bdbf019ea6cf07c80b0
+  metadata.gz: 7b7c2e1fc4c9c42e768327c9dead6b9eaa9f8a77b44ea7697b51306617e2702a
+  data.tar.gz: 4aee4bdb365b8c7efd52c2aa33ed8d5b0f83cb3ca7e551986062721b33faea24
 SHA512:
-  metadata.gz: ee9e805c8fe449abca81d6fdfff713130359c7b3cb5c246a48fc37e8f6a6a93ab25c2203c1aa5ecfb441ca0a3e7223373ebad31b2a5314660eba5ab5bb31ed0c
-  data.tar.gz: a910b4872388fade3cf044e7f2c9e2562a23d5730a2faffc4f4daa9f942220a44c02fa3daead5e078e662eaddb8ecb27c034f3bb190324267b0b4a04e953cd87
+  metadata.gz: f96d200ceb54255e82e09248179b442032c96a1f6bf28efeb410a8a5b4f9423ad5c08815f71cc9a47b2f03c9bbaeef258cdfe52b435b168e65cdaa0bb832adbd
+  data.tar.gz: 8dbfcce551188386379bb479021e24dc8b027f6edba4fd0f87ef17ef4eda1535010a0eaf5ca973fda304cfed339a4b0e53306e9fda012336686cc70c75d5b868

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/fluent-plugin-lm-logs.gemspec

@@ -2,10 +2,15 @@
 # under the Apache License Version 2.0.
 # This product includes software developed at LogicMonitor (https://www.logicmonitor.com).
 # Copyright 2020 LogicMonitor, Inc.
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "fluent/plugin/version.rb"
+
 
 Gem::Specification.new do |spec|
   spec.name                           = "fluent-plugin-lm-logs"
-  spec.version                        = '1.0.4'
+  spec.version                        = LmLogsFluentPlugin::VERSION
   spec.authors                        = ["LogicMonitor"]
   spec.email                          = "rubygems@logicmonitor.com"
   spec.summary                        = "LogicMonitor logs fluentd output plugin"
@@ -16,9 +21,10 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"]    = "https://github.com/logicmonitor/lm-logs-fluentd"
   spec.metadata["documentation_uri"]  = "https://www.rubydoc.info/gems/lm-logs-fluentd"
 
-  spec.files         = [".gitignore", "Gemfile", "LICENSE", "README.md", "Rakefile", "fluent-plugin-lm-logs.gemspec", "lib/fluent/plugin/out_lm.rb"]
+  spec.files         = [".gitignore", "Gemfile", "LICENSE", "README.md", "Rakefile", "fluent-plugin-lm-logs.gemspec", "lib/fluent/plugin/version.rb", "lib/fluent/plugin/out_lm.rb"]
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency "fluentd", [">= 1", "< 2"]
+  spec.add_runtime_dependency "net-http-persistent", '~> 4.0.1'
 end

data/lib/fluent/plugin/out_lm.rb

@@ -7,9 +7,13 @@ require 'json'
 require 'openssl'
 require 'base64'
 require 'net/http'
+require 'net/http/persistent'
 require 'net/https'
 require('zlib')
 
+require_relative "version"
+
+
 
 module Fluent
   class LmOutput < BufferedOutput
@@ -42,6 +46,8 @@ 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
   
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
@@ -54,12 +60,24 @@ module Fluent
     # Open sockets or files here.
     def start
       super
+      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
 
     # This method is called when shutting down.
     # Shutdown the thread and close sockets or files here.
     def shutdown
       super
+      @http_client.shutdown
     end
 
     # This method is called when an event reaches to Fluentd.
@@ -160,22 +178,15 @@ module Fluent
     end
 
     def send_batch(events)
-      url = "https://#{@company_name}.logicmonitor.com/rest/log/ingest"
       body = events.to_json
-      uri = URI.parse(url)
       
       if @debug
-        log.info "Sending #{events.length} events to logic monitor at #{url}"
+        log.info "Sending #{events.length} events to logic monitor at #{@url}"
         log.info "Request json #{body}"
       end
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      request = Net::HTTP::Post.new(uri.request_uri)
+      request = Net::HTTP::Post.new(@uri.request_uri)
       request['authorization'] = generate_token(events)
-      request['Content-type'] = "application/json"
-      request['User-Agent'] = log_source + "/" + version_id
 
       if @compression == "gzip"
         request['Content-Encoding'] = "gzip"
@@ -191,9 +202,9 @@ module Fluent
         request.each_header {|key,value| log.info "#{key} = #{value}" }
       end
 
-      resp = http.request(request)
-      if @debug || (!resp.kind_of? Net::HTTPSuccess)
-        log.info "Status code:#{resp.code} Request Id:#{resp.header['x-request-id']}"
+      resp = @http_client.request @uri, request
+      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
 

data/lib/fluent/plugin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - LogicMonitor
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 description: This output plugin sends fluentd records to the configured LogicMonitor
   account.
 email: rubygems@logicmonitor.com
@@ -44,13 +58,14 @@ files:
 - Rakefile
 - fluent-plugin-lm-logs.gemspec
 - lib/fluent/plugin/out_lm.rb
+- lib/fluent/plugin/version.rb
 homepage: https://www.logicmonitor.com
 licenses:
 - Apache-2.0
 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
@@ -65,8 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: LogicMonitor logs fluentd output plugin
 test_files: []