fluent-plugin-lm-logs 0.0.7 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a4b80a29df39066cf4d0d02dd5d3dd8a409253a9ffac8e2df552aa6d836c8fd
-  data.tar.gz: 80a03e355f4485810f8f591688d2193258a480de797f5b73a627c802ce940a7e
+  metadata.gz: c930b2614b184eeba146418a22a10d732b8fd7aa57aabc8db45ec6d9e8608f0a
+  data.tar.gz: 6ced74d3ff2e35a3771b63d7f88572c2ebfd4e3dccd23e7a450a5bce6b7a22f7
 SHA512:
-  metadata.gz: d4d74839b0bf81fa4b43b79a87015dec5c1c4d15e19e021c966f5c936e1503f55643c7f6902c17cabfd3788701a0f98b6dec6c56903b3ce5aa8c2e9907f11448
-  data.tar.gz: 7ecf5e67a5881154c9f0c5a82d0e824e6cb98bb9b8bf66abbda06bc800ecc2c472f445107bac72996df7bbf2558e4890fe61400f92b84c617c7bb2aaa1795d60
+  metadata.gz: dd6ecf139c62cfba239000b45f134bd5c162ea773112438223fcbc20291ddaf97aebc3dec7aca2469639160f585baa2af628b94d445cee01dcb10d5bea7ffc31
+  data.tar.gz: e4e97f690c535f223b8c934bcdcf03cf3821f799f6018520ea8c2400eeb726b75de98d7eefa52ab80abf679ec85cc8941123596275f964755b4751372ffc1daf

data/README.md

@@ -1,12 +1,13 @@
 
+[![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)
 This output plugin sends Fluentd records to the configured LogicMonitor account.
 
 ## Prerequisites
 
 Install the plugin:
-* With gem:       `gem install lm-logs-fluentd`
-* For deb packages:       `td-agent-gem install lm-logs-fluentd`
+* With gem:       `gem install fluent-plugin-lm-logs`
+* For deb packages:       `td-agent-gem install fluent-plugin-lm-logs`
 
 Alternatively, you can add `out_lm.rb` to your Fluentd plugins directory.
 
@@ -19,11 +20,15 @@ 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>
-    flush_interval 1s
+    company_name <lm_company_name>
+	access_id <lm_access_id>
+    access_key <lm_access_key>
+      <buffer>
+        @type memory
+        flush_interval 1s
+        chunk_limit_size 5m
+      </buffer> 
     debug false
 </match>
 ```
@@ -34,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"
@@ -43,6 +48,10 @@ Returns the event:
 
 **Note:** Make sure that logs have a message field. Requests sent without a message will not be accepted. 
 
+### Kubernetes
+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
 
 - `{"message":"Hey!!", "event_key":"lm_property_value"}` with mapping `{"event_key": "lm_property"}`
@@ -59,4 +68,4 @@ Returns the event:
 | `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. |
-
+| `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.7'
-  spec.authors                        = ["Logic Monitor"]
+  spec.version                        = '0.0.12'
+  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,6 +26,10 @@ 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 => ""
 
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
@@ -71,6 +76,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 +94,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
 
@@ -93,10 +108,9 @@ module Fluent
       url = "https://#{@company_name}.logicmonitor.com/rest/log/ingest"
       body = events.to_json
       uri = URI.parse(url)
-
-      log.info "Sending #{events.length} events to logic monitor at #{url}"
       
       if @debug
+        log.info "Sending #{events.length} events to logic monitor at #{url}"
         log.info "Request json #{body}"
       end
 
@@ -105,16 +119,20 @@ 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"
 
-      resp = http.request(request)
-      if @debug
-        log.info "Response #{resp.body}"
+      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 !resp.kind_of? Net::HTTPSuccess
-        log.error "Error sending batch #{resp.body}"
+      resp = http.request(request)
+      if @debug || (!resp.kind_of? Net::HTTPSuccess)
+        log.info "Status code:#{resp.code} Request Id:#{resp.header['x-request-id']}"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.12
 platform: ruby
 authors:
-- Logic Monitor
+- LogicMonitor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-11-25 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.1.4
 signing_key: 
 specification_version: 4
-summary: Logic Monitor logs fluentd output plugin
+summary: LogicMonitor logs fluentd output plugin
 test_files: []