fluent-plugin-lm-logs 0.0.9 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd3e7b9db6e1987cb6c973f5f2158a38cced85cd91f674ab431556212a821ca1
-  data.tar.gz: 18788379b54ac12b84b1bfa5b3f0d6aa5b0ea61d7e2c59386d36bf581b9c6565
+  metadata.gz: 6ac69aa367c60b885d377a7c818fbfcb70c8af34d86315fee0d2b18778351a92
+  data.tar.gz: b3cfdfbe4362b7f8d71a79d5aa34e92cc2b29c1a63b18a00b7aaa0cbe09cb14a
 SHA512:
-  metadata.gz: 0c4777a3d6c39163d779ec794c26d9792a191ee3ed9730043698dc68000b61ea5e81bf8bf0e7c24f7851d4a99cdc1eef6fe22b0ccd335299bc93bea481b77b23
-  data.tar.gz: e230f2badade41a1126ecc9ea73c0c0aacf62920f41fbcbb063d1ba7dbdbba9a051b4d886b239916d9a3d836f2c54aeb024aebf2107c8f30dbff460a7d86dbc5
+  metadata.gz: aae1c2c44c9cc03c7256147322eb34d14eb551ea115a5befde0aa56903afb9a98e21d5670f0c253ac6fc7ef9a0be65ebd827ccc0581bda097597de77a1a5861f
+  data.tar.gz: fb6d25f6b71ad3c30084840e145ec1e7c4d98d036773762babb3b9d18c8136f5f384f85f065c3758972448f861f4e5617a5d57a97efcb5e0d77f30c8a945b446

data/README.md

@@ -1,6 +1,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/fluent-plugin-lm-logs.svg)](http://badge.fury.io/rb/fluent-plugin-lm-logs)
-# lm-logs-fluentd (beta)
+# lm-logs-fluentd
 This output plugin sends Fluentd records to the configured LogicMonitor account.
 
 ## Prerequisites
@@ -20,10 +20,10 @@ Create a custom `fluent.conf` or edit the existing one to specify which logs sho
 # send them to LogicMonitor
 <match lm.**>
     @type lm
-    company_name <account_name>
     resource_mapping {"<event_key>": "<lm_property>"}
-    access_id <your_lm_access_id>
-    access_key <your_lm_access_key>
+    company_name <lm_company_name>
+	access_id <lm_access_id>
+    access_key <lm_access_key>
       <buffer>
         @type memory
         flush_interval 1s
@@ -39,7 +39,7 @@ Sending:
 
 `curl -X POST -d 'json={"message":"hello LogicMonitor from fluentd", "event_key":"lm_property_value"}' http://localhost:8888/lm.test`
 
-Returns the event:
+Produces this event:
 ```
 {
     "message": "hello LogicMonitor from fluentd"
@@ -49,9 +49,8 @@ Returns the event:
 **Note:** Make sure that logs have a message field. Requests sent without a message will not be accepted. 
 
 ### Kubernetes
-Logic Monitor collects k8s logs automatically via FluentD daemonset, It requires a plugin for this. We recommend using [fluent-plugin-kubernetes_metadata_filter](https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter) to collect  Kubernetes metadata.
-
-See the [example](https://github.com/logicmonitor/lm-logs-fluentd/tree/master/Examples/k8s) to forward k8s logs to Logic Monitor.
+The Kubernetes configuration for LM Logs is deployed as a Helm chart.
+See the [LogicMonitor Helm repository](https://github.com/logicmonitor/k8s-helm-charts/tree/master/lm-logs).
 
 ### Resource mapping examples
 
@@ -68,4 +67,5 @@ See the [example](https://github.com/logicmonitor/lm-logs-fluentd/tree/master/Ex
 | `access_id` | LM API Token access ID. |
 | `access_key` | LM API Token access key. |
 | `flush_interval` | Defines the time in seconds to wait before sending batches of logs to LogicMonitor. Default is `60s`. |
-| `debug` | When `true`, logs more information to the fluentd console. |
+| `debug` | When `true`, logs more information to the fluentd console. |
+| `force_encoding` | Specify charset when logs contains invalid utf-8 characters. |

data/fluent-plugin-lm-logs.gemspec

@@ -1,14 +1,14 @@
 # Unless explicitly stated otherwise all files in this repository are licensed
 # under the Apache License Version 2.0.
-# This product includes software developed at Logic Monitor (https://www.logicmonitor.com).
-# Copyright 2020 Logic Monitor, Inc.
+# This product includes software developed at LogicMonitor (https://www.logicmonitor.com).
+# Copyright 2020 LogicMonitor, Inc.
 
 Gem::Specification.new do |spec|
   spec.name                           = "fluent-plugin-lm-logs"
-  spec.version                        = '0.0.9'
-  spec.authors                        = ["Logic Monitor"]
+  spec.version                        = '1.0.1'
+  spec.authors                        = ["LogicMonitor"]
   spec.email                          = "rubygems@logicmonitor.com"
-  spec.summary                        = "Logic Monitor logs fluentd output plugin"
+  spec.summary                        = "LogicMonitor logs fluentd output plugin"
   spec.description                    = "This output plugin sends fluentd records to the configured LogicMonitor account."
   spec.homepage                       = "https://www.logicmonitor.com"
   spec.license                        = "Apache-2.0"

data/lib/fluent/plugin/out_lm.rb

@@ -5,9 +5,10 @@ require 'uri'
 require 'digest'
 require 'json'
 require 'openssl'
-require "base64"
+require 'base64'
 require 'net/http'
 require 'net/https'
+require('zlib')
 
 
 module Fluent
@@ -25,7 +26,15 @@ module Fluent
     config_param :resource_mapping,  :hash, :default => {"host": "system.hostname", "hostname": "system.hostname"}
 
     config_param :debug,  :bool, :default => false
+		
+    config_param :force_encoding,  :string, :default => ""
 
+    config_param :compression,  :string, :default => ""
+
+    config_param :log_source,  :string, :default => "lm-logs-fluentd"
+
+    config_param :version_id,  :string, :default => "version_id"
+    
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
     # If the configuration is invalid, raise Fluent::ConfigError.
@@ -71,6 +80,11 @@ module Fluent
       resource_map = {}
       lm_event = {}
       lm_event["message"] = record["message"]
+      
+      if @force_encoding != ""
+        lm_event["message"] = lm_event["message"].force_encoding(@force_encoding).encode("UTF-8")
+      end
+
       if record["_lm.resourceId"] == nil
           @resource_mapping.each do |key, value|
             k = value
@@ -84,8 +98,13 @@ module Fluent
       else
         lm_event["_lm.resourceId"] = record["_lm.resourceId"]
       end
-  
-      lm_event["timestamp"] = Time.at(time).utc.to_datetime.rfc3339
+
+      if record["timestamp"] != nil
+        lm_event["timestamp"] = record["timestamp"]
+      else
+        lm_event["timestamp"] = Time.at(time).utc.to_datetime.rfc3339
+      end
+
       return lm_event
     end
 
@@ -104,8 +123,22 @@ module Fluent
 
       request = Net::HTTP::Post.new(uri.request_uri)
       request['authorization'] = generate_token(events)
-      request['Content-type'] = "application/json"  
-      request.body = body
+      request['Content-type'] = "application/json"
+      request['User-Agent'] = log_source + "/" + version_id
+
+      if @compression == "gzip"
+        request['Content-Encoding'] = "gzip"
+        gzip = Zlib::GzipWriter.new(StringIO.new)
+        gzip << body
+        request.body = gzip.close.string
+      else
+        request.body = body
+      end
+
+      if @debug
+        log.info "Sending the below request headers to logicmonitor:"
+        request.each_header {|key,value| log.info "#{key} = #{value}" }
+      end
 
       resp = http.request(request)
       if @debug || (!resp.kind_of? Net::HTTPSuccess)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.1
 platform: ruby
 authors:
-- Logic Monitor
+- LogicMonitor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -65,8 +65,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
-summary: Logic Monitor logs fluentd output plugin
+summary: LogicMonitor logs fluentd output plugin
 test_files: []