fluent-plugin-vmware-loginsight 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0ed8fee9ccfe49ebb1ba72c051649f66ddcadb5efac2478f0c47c5138ba9bd
-  data.tar.gz: 8ce497a63cb0b54abdb6d3b993f43733e76d7cc835c5d1b70aaec24f54899aba
+  metadata.gz: 769cbf3caa38634e432618e399254da2f53d6ba18e8b2def4b9d172aaed29c63
+  data.tar.gz: ba0ef75193473229d2d1d47de0866160e261dcd19672f5fde1c7bdfd9b423ea1
 SHA512:
-  metadata.gz: 24e31e9ae6b324513deede287efdded411c2352c934f027d0ee1c1c7e3e1f4c3858967a9b33fb2419c81d4f5b4a6a5f1e9e275d7cc8e89dce96bf751a4aa275b
-  data.tar.gz: 2ac6b44914a33c75f6e37c0332d60a10a59ba1f706e2dc252edcaa918e814be9cebc779b359b03188620e557958e26181877a0858293c094f4bf924f1e249c98
+  metadata.gz: 3e6a40c4f69297840d6da7cab368a22df065080e0e3706e351686f67ea440d04d8a550d1b4554bac46a25d922be4c40584afb42ffe958c3f48b1cdb18d19822f
+  data.tar.gz: 1f954795a9d5064904df57469ebe071f94400a39644b14101767542a13bab312a6091ca0348855c8c392be385edf030374e3588c1d012da7208d0c8a6d74b335

data/README.md

@@ -101,6 +101,9 @@ request_retries, :integer, :default => 3
 # http connection ttl for each request
 request_timeout, :time, :default => 5
 
+# If set, enables debug logs for http connection
+http_conn_debug, :bool, :default => false :: Valid Value: true | false
+
 # Simple rate limiting: ignore any records within `rate_limit_msec` since the last one
 rate_limit_msec, :integer, :default => 0
 
@@ -113,15 +116,15 @@ 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
+# Keys from log event whose values should be added as log message/text to loginsight.
+# These key/value pairs won't expanded/flattened and 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
 
 # Seperator to use for joining flattened keys
-flatten_hashes_separator, :string, :default => "__"
+flatten_hashes_separator, :string, :default => "_"
 ```
 
 For more examples look at [examples](./examples/)

data/examples/Dockerfile

@@ -21,6 +21,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev ruby-dev libffi-dev" \
  && sudo gem install \
         fluent-plugin-systemd \
         fluent-plugin-kubernetes_metadata_filter \
+        fluent-plugin-vmware-loginsight \
  && sudo gem sources --clear-all \
  && SUDO_FORCE_REMOVE=yes \
     apt-get purge -y --auto-remove \

data/examples/fluent.conf

@@ -95,6 +95,7 @@
     serializer json
     rate_limit_msec 0
     raise_on_error false
+    log_text_keys ["log","msg","message"]
     include_tag_key true
     tag_key tag
   </store>

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.4"
+  spec.version = "0.1.5"
   spec.authors = ["Vishal Mohite", "Chris Todd"]
   spec.email   = ["vmohite@vmware.com", "toddc@vmware.com"]
 

data/lib/fluent/plugin/out_vmware_loginsight.rb

@@ -51,6 +51,7 @@ module Fluent
       config_param :serializer, :string, :default => :json
       config_param :request_retries, :integer, :default => 3
       config_param :request_timeout, :time, :default => 5
+      config_param :http_conn_debug, :bool, :default => false
       config_param :max_batch_size, :integer, :default => 512000
 
       # Simple rate limiting: ignore any records within `rate_limit_msec`
@@ -68,7 +69,7 @@ module Fluent
       # 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
-      config_param :flatten_hashes_separator, :string, :default => "__"
+      config_param :flatten_hashes_separator, :string, :default => "_"
 
 
       def initialize
@@ -116,10 +117,8 @@ module Fluent
 
       def shorten_key(key)
         # LI doesn't allow some characters in field 'name'
-        # like '/', '-', '\', '.', etc. so replace them with '_'
-        key = key.gsub(/[\/\.\-\\]/,'_').downcase
-        # remove double underscores
-        key = key.gsub(/__/,'_')
+        # like '/', '-', '\', '.', etc. so replace them with @flatten_hashes_separator
+        key = key.gsub(/[\/\.\-\\]/,@flatten_hashes_separator).downcase
         # shorten field names
         key = key.gsub(/kubernetes_/,'k8s_')
         key = key.gsub(/namespace/,'ns')
@@ -154,7 +153,7 @@ module Fluent
             # 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 = value.to_s
               value.force_encoding("utf-8")
             rescue Exception=>e
               $log.warn "force_encoding exception: " "#{e.class}, '#{e.message}', " \
@@ -203,8 +202,9 @@ module Fluent
               end
             end
           when Array
-            # Don't mess with arrays, leave them unprocessed
-            ret.merge!({prefix.join(@flatten_hashes_separator) => record})
+            record.each do |value|
+              ret.merge! flatten_record(value, prefix)
+            end
           else
             return {prefix.join(@flatten_hashes_separator) => record}
         end
@@ -238,7 +238,7 @@ module Fluent
 
           http_conn = Net::HTTP.new(uri.host, uri.port)
           # For debugging, set this
-          #http_conn.set_debug_output($stdout)
+          http_conn.set_debug_output($stdout) if @http_conn_debug
           http_conn.use_ssl = (uri.scheme == 'https')
           if http_conn.use_ssl?
             http_conn.ca_file = @ca_file

metadata

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