fluent-plugin-vmware-loginsight 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2585e4aea973a9cd5070714c36bbb98a0c9ea039ab65aaae92d07a6b88fa773f
-  data.tar.gz: 8726b2ab9f414a9acb79b18d74f989cd3a3017b4fec255cfcc495df848e5aa65
+  metadata.gz: 8f0ed8fee9ccfe49ebb1ba72c051649f66ddcadb5efac2478f0c47c5138ba9bd
+  data.tar.gz: 8ce497a63cb0b54abdb6d3b993f43733e76d7cc835c5d1b70aaec24f54899aba
 SHA512:
-  metadata.gz: 79830b33a50d080964123b4d61f9d9943876960c4a4afc6ef97da3442d50cbb1bfe941106e9c10284f9552c4a7c527a076574e0ebccab2bae6e9d2ccdd33ca16
-  data.tar.gz: 055ed0fcee328c8faa8748490630460aae2c8c596eaf319b3a816880a222edfddb2666df4cfd2f113432f42d191dc6b3cad100fa3e4e696fab8f8703fb0daf30
+  metadata.gz: 24e31e9ae6b324513deede287efdded411c2352c934f027d0ee1c1c7e3e1f4c3858967a9b33fb2419c81d4f5b4a6a5f1e9e275d7cc8e89dce96bf751a4aa275b
+  data.tar.gz: 2ac6b44914a33c75f6e37c0332d60a10a59ba1f706e2dc252edcaa918e814be9cebc779b359b03188620e557958e26181877a0858293c094f4bf924f1e249c98

data/README.md

@@ -113,6 +113,10 @@ include_tag_key, :bool, :default => true :: Valid Value: true | false
 # Metadata key that identifies Fluentd tags
 tag_key, :string, :default => 'tag'
 
+# Keys from log event whose values should be added as log message/text
+# to loginsight. Note these key/value pairs  won't be added as metadata/fields
+log_text_keys, :array, :default => ["log", "message", "msg"] :: Valid Value: Array of strings
+
 # Flatten hashes to create one key/val pair w/o losing log data
 flatten_hashes, :bool, :default => true :: Valid Value: true | false
 

data/fluent-plugin-vmware-loginsight.gemspec

@@ -14,7 +14,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-vmware-loginsight"
-  spec.version = "0.1.3"
+  spec.version = "0.1.4"
   spec.authors = ["Vishal Mohite", "Chris Todd"]
   spec.email   = ["vmohite@vmware.com", "toddc@vmware.com"]
 

data/lib/fluent/plugin/out_vmware_loginsight.rb

@@ -62,6 +62,9 @@ module Fluent
       config_param :include_tag_key, :bool, :default => true
       # Metadata key that identifies Fluentd tags
       config_param :tag_key, :string, :default => 'tag'
+      # Keys from log event whose values should be added as log message/text
+      # to loginsight. Note these key/value pairs  won't be added as metadata/fields
+      config_param :log_text_keys, :array, default: ["log", "message", "msg"], value_type: :string
       # Flatten hashes to create one key/val pair w/o losing log data
       config_param :flatten_hashes, :bool, :default => true
       # Seperator to use for joining flattened keys
@@ -131,6 +134,8 @@ module Fluent
         flattened_records = {}
         if @flatten_hashes
           flattened_records = flatten_record(record, [])
+        else
+          flattened_records = record
         end
         flattened_records[@tag_key] = tag if @include_tag_key
         fields = []
@@ -146,8 +151,9 @@ module Fluent
             end
             keys.push(key)
             key.force_encoding("utf-8")
-            # convert value to string if needed
+            # convert value to json string if its a hash and to string if not already a string
             begin
+              value = value.to_json if value.is_a?(Hash)
               value = value.to_s if not value.instance_of?(String)
               value.force_encoding("utf-8")
             rescue Exception=>e
@@ -156,7 +162,7 @@ module Fluent
               value = "Exception during conversion: #{e.message}"
             end
           end
-          if ['log', 'message', 'msg'].include?(key)
+          if @log_text_keys.include?(key)
             if log != "#{value}"
               if log.empty?
                 log = "#{value}"
@@ -189,9 +195,13 @@ module Fluent
 
         case record
           when Hash
-            record.each { |key, value|
-              ret.merge! flatten_record(value, prefix + [key.to_s])
-            }
+            record.each do |key, value|
+              if @log_text_keys.include?(key)
+                ret.merge!({key.to_s => value})
+              else
+                ret.merge! flatten_record(value, prefix + [key.to_s])
+              end
+            end
           when Array
             # Don't mess with arrays, leave them unprocessed
             ret.merge!({prefix.join(@flatten_hashes_separator) => record})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-vmware-loginsight
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Vishal Mohite
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler