fluent-plugin-lm-logs 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbacc1e0e4eb5389c11d4b23c28eda6100919da6d7de0abbda9edf13dffbf682
-  data.tar.gz: 3bffdba784febf493f69ba0be9c1745f53d7aebb8f66ef92bf23b252fb91d2bb
+  metadata.gz: d615e41f382455dbcae73e2449a311c57bf2a9acc24e55d27127737e162a9469
+  data.tar.gz: e789739f1b6407674a89cb0fe6f54a91c5fdd6936158952113b53d5bf0f0a6fd
 SHA512:
-  metadata.gz: 34362b69e402d439ee415089540a5f3d1532bb5f44c997bca79437e57a64286579b3e9c8349ebb44095bf86e976e2b197ddd9f7f20a32600e2c164685310b62e
-  data.tar.gz: '0631937f8f545e675735e207d6e6137748ef0bc1445cdab27c1b0179f0513daa271fbee4bcbe9000aa8fea1df155e5f208f82fdb6002a6e58f133f09c2616e57'
+  metadata.gz: c99d630c5cf20b75afd1759ca6628dbe833e3cd3ff2d98c481651295f4dc8bae538e72dbf7f35acddcf23643385fc76e3463df35c9adb39494e2140987568733
+  data.tar.gz: 74d559060251b796f8ed252eab5a3df58daddf9f0cc467cefc266ff4f7b4f2944026390292b938eb8248c9cb07bd3f4abc0a039ba6c40dafb77109ad4a3fd9c1

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.3'
+  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,14 +7,22 @@ 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
     Fluent::Plugin.register_output('lm', self)
 
+    RESOURCE_MAPPING_KEY      = "_lm.resourceId".freeze
+    DEVICELESS_KEY_SERVICE    = "resource.service.name".freeze
+    DEVICELESS_KEY_NAMESPACE  = "resource.service.namespace".freeze
+
     # config_param defines a parameter. You can refer a parameter via @path instance variable
 
     config_param :access_id,  :string, :default => "access_id"
@@ -50,12 +58,18 @@ module Fluent
     # Open sockets or files here.
     def start
       super
+      @http_client = Net::HTTP::Persistent.new name: "fluent-plugin-lm-logs"
+      @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.
@@ -91,7 +105,8 @@ module Fluent
       end
 
       if !@device_less_logs
-        if record["_lm.resourceId"] == nil
+        # With devices
+        if record[RESOURCE_MAPPING_KEY] == nil
             @resource_mapping.each do |key, value|
               k = value
               nestedVal = record
@@ -100,17 +115,21 @@ module Fluent
                 resource_map[k] = nestedVal
               end
             end
-          lm_event["_lm.resourceId"] = resource_map
+          lm_event[RESOURCE_MAPPING_KEY] = resource_map
         else
-          lm_event["_lm.resourceId"] = record["_lm.resourceId"]
+          lm_event[RESOURCE_MAPPING_KEY] = record[RESOURCE_MAPPING_KEY]
         end
       else
-        if record["service"]==nil
+        # Device less
+        if record[DEVICELESS_KEY_SERVICE]==nil
           log.error "When device_less_logs is set \'true\', record must have \'service\'. Ignoring this event #{lm_event}."
           return nil
         else
-          lm_event["service"] = encode_if_necessary(record["service"]) 
-        end  
+          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]) 
+          end
+        end
       end
 
       if record["timestamp"] != nil
@@ -151,22 +170,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"
@@ -182,7 +194,8 @@ module Fluent
         request.each_header {|key,value| log.info "#{key} = #{value}" }
       end
 
-      resp = http.request(request)
+      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']}"
       end

data/lib/fluent/plugin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - LogicMonitor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2023-05-22 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,6 +58,7 @@ 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
@@ -65,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: LogicMonitor logs fluentd output plugin