fluent-plugin-lm-logs 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c2298de6fe81e9eb49052ee49d55180193d254fee912339b9c8f6fad6c7aea1
-  data.tar.gz: 0a64fdb982ca4d8768175db534198b942d96fdcb22519913c5c077b7201bb6ea
+  metadata.gz: fbacc1e0e4eb5389c11d4b23c28eda6100919da6d7de0abbda9edf13dffbf682
+  data.tar.gz: 3bffdba784febf493f69ba0be9c1745f53d7aebb8f66ef92bf23b252fb91d2bb
 SHA512:
-  metadata.gz: 95fe45b670b97925e672ecad76a724ed9eef24fd1e1685a131a4375ac7e662161aa5612ec34f3fc99e0f5817b24e7d640481b457bd466f2d2b3455f8e004e394
-  data.tar.gz: c69f47a5aad81cb1fbf778f14bc3238ee0271cb9530516a31120e46829aa7cf28336d509f9d6be2ddb155794ec9926896b2fc9738f524a30cf222f31013e322c
+  metadata.gz: 34362b69e402d439ee415089540a5f3d1532bb5f44c997bca79437e57a64286579b3e9c8349ebb44095bf86e976e2b197ddd9f7f20a32600e2c164685310b62e
+  data.tar.gz: '0631937f8f545e675735e207d6e6137748ef0bc1445cdab27c1b0179f0513daa271fbee4bcbe9000aa8fea1df155e5f208f82fdb6002a6e58f133f09c2616e57'

data/README.md

@@ -70,7 +70,7 @@ See the [LogicMonitor Helm repository](https://github.com/logicmonitor/k8s-helm-
 | `debug` | When `true`, logs more information to the fluentd console. |
 | `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` and `namespace` when `true`. default `false`. |
-| `metadata_to_exclude` | `String array` of keys of metadata to exclude. default `empty` |
+| `device_less_logs` | When `true`, do not map log with any resource. record must have `service` when `true`. default `false`. |
+
 
 

data/fluent-plugin-lm-logs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                           = "fluent-plugin-lm-logs"
-  spec.version                        = '1.0.2'
+  spec.version                        = '1.0.3'
   spec.authors                        = ["LogicMonitor"]
   spec.email                          = "rubygems@logicmonitor.com"
   spec.summary                        = "LogicMonitor logs fluentd output plugin"

data/lib/fluent/plugin/out_lm.rb

@@ -38,8 +38,6 @@ module Fluent
     config_param :version_id,  :string, :default => "version_id"
 
     config_param :device_less_logs,  :bool, :default => false
-
-    config_param :metadata_to_exclude,  :array, default: [], value_type: :string
   
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
@@ -87,6 +85,11 @@ module Fluent
     def process_record(tag, time, record)
       resource_map = {}
       lm_event = {}
+
+      if @include_metadata
+        lm_event = get_metadata(record)
+      end
+
       if !@device_less_logs
         if record["_lm.resourceId"] == nil
             @resource_mapping.each do |key, value|
@@ -101,6 +104,13 @@ module Fluent
         else
           lm_event["_lm.resourceId"] = record["_lm.resourceId"]
         end
+      else
+        if record["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  
       end
 
       if record["timestamp"] != nil
@@ -109,35 +119,35 @@ module Fluent
         lm_event["timestamp"] = Time.at(time).utc.to_datetime.rfc3339
       end
 
-      if @include_metadata
-        record.each do |key, value|
-          case key
-          when *@metadata_to_exclude.concat(["timestamp","_lm.resourceId","log","message"])
-          else    
-              lm_event["#{key}"] = value
-  
-              if @force_encoding != ""
-                  lm_event["#{key}"] = lm_event["#{key}"].force_encoding(@force_encoding).encode("UTF-8")
-              end
-          end
+      lm_event["message"] = encode_if_necessary(record["message"])
+
+      return lm_event
+    end
+
+    def get_metadata(record)
+      #if encoding is not defined we will skip going through each key val 
+      #and return the whole record for performance reasons in case of a bulky record.
+      if @force_encoding == "" 
+        return record
+      else
+        lm_event = {}
+        record.each do |key, value| 
+          lm_event["#{key}"] = get_encoded_string(value)
         end
+        return lm_event
       end
-      lm_event["message"] = record["message"]
-    
+    end
+
+    def encode_if_necessary(str)
       if @force_encoding != ""
-        lm_event["message"] = lm_event["message"].force_encoding(@force_encoding).encode("UTF-8")
+        return get_encoded_string(str)
+      else
+        return str
       end
+    end
 
-      if @device_less_logs
-        if record["service"]==nil || record["namespace"] == nil
-          log.error "When device_less_logs is set \'true\', record must have \'service\' and \'namespace\'. Ignoring this event #{lm_event}."
-          return nil
-        else
-          lm_event["service"] = record["service"]
-          lm_event["namespace"] = record["namespace"] 
-        end
-      end
-      return lm_event
+    def get_encoded_string(str)
+      return str.force_encoding(@force_encoding).encode("UTF-8")
     end
 
     def send_batch(events)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - LogicMonitor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd