fluent-plugin-gelf-best 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f39189270e1bd23e196155e2a7bbead5ceb5620f559404198bc212b30eebef
-  data.tar.gz: 9fd452c44a244e8bdea46b8db8c498643b8bc47212c0bd339aee7cf111bc7afe
+  metadata.gz: b3d0be1e13c195cc69d517d9678fd9ed15128700a203f6fcded95a8acf26ffa5
+  data.tar.gz: b5f48294ede888f480c827fcfeb635ae0769631c8e77b0329773927ca64a0aef
 SHA512:
-  metadata.gz: cdcb16ce91a9946ea5e4dfd5977a103c5eb1e81e571376a2562add5312f302532f0939c389a039cb8ef01c4ece2c198eec73b41140fa88eda3b16e9470ea0d46
-  data.tar.gz: eb382d4a3682754643eefbf1cb16853b5f47baa1d8ffe347e628e4a1ba32116cc25aa5f42296ccf10ad64ce193191ecac45bd493435269d97fa13b78176e94ca
+  metadata.gz: 1d0a6549e8a686fca58906ca27fd153e7e6d84cac711c59a7e0312f039ad591815567d08d55724d1a88c1d7ef3ae3acef214a652fae50aac09a3fc6145aae24d
+  data.tar.gz: 60bebae56b82025efa2f141be0842d1fe966d47d0d633fbe2e18bce7dbb7718635425150ae4bce2c69713b6a6b814efd6a63af508599ea16b293c2086d74c7dc

data/lib/fluent/plugin/formatter_gelf.rb

@@ -4,7 +4,7 @@ require "yajl"
 
 module Fluent
   module TextFormatter
-    class GELFFormatter < Formatter
+    class GelfFormatter < Formatter
 
       unless method_defined?(:log)
         define_method('log') { $log }

data/lib/fluent/plugin/gelf_plugin_util.rb

@@ -1,91 +1,88 @@
-# encoding=utf-8
+require 'oj'
+require 'date'
+require 'gelf'
+
 module Fluent
   module GelfPluginUtil
 
-    require 'gelf'
+    LEVEL_MAP = {
+      '0' => GELF::UNKNOWN, '1' => GELF::UNKNOWN, 'a' => GELF::UNKNOWN,
+      '2' => GELF::FATAL, 'c' => GELF::FATAL,
+      '3' => GELF::ERROR,
+      '4' => GELF::WARN, 'w' => GELF::WARN,
+      '5' => GELF::INFO, 'n' => GELF::INFO,
+      '6' => GELF::INFO, 'i' => GELF::INFO,
+      '7' => GELF::DEBUG, 'd' => GELF::DEBUG,
+      'e' => GELF::ERROR
+    }.freeze
 
-    def make_gelfentry(tag,time,record, conf = {})
-      gelfentry = { '_tag' => tag }
-      if defined? Fluent::EventTime and time.is_a? Fluent::EventTime then
-        gelfentry['timestamp'] = time.sec + (time.nsec.to_f/1000000000).round(3)
-      else
-        gelfentry['timestamp'] = time
+    def get_internal_json_out(record, key)
+      json_data = parse_json_field(record[key])
+      return record unless json_data
+
+      record.delete(key)
+      merge_record_with_json(record, json_data)
+    rescue Oj::ParseError, EncodingError
+      # Return original record if JSON parsing fails
+      record
+    end
+
+    def make_gelfentry(tag, time, record, conf = {})
+      record = get_internal_json_out(record, "message")
+      record = get_internal_json_out(record, "log")
+      gelfentry = {"_fluentd_tag" => tag, "timestamp" => calculate_timestamp(time)}
+
+      record.each do |k, v|
+        process_record_entry(k, v, conf, gelfentry)
       end
 
-      record.each_pair do |k,v|
-        case k
-        when 'host' then
-          if conf[:use_record_host] then
-            gelfentry['host'] = v
-          else
-            gelfentry['_host'] = v
-          end
-        when 'level' then
-          case v.to_s.downcase[0]
-          # emergency and alert aren't supported by gelf-rb
-          when "0" then
-            gelfentry['level'] = GELF::UNKNOWN
-          when "1", "a" then
-            gelfentry['level'] = GELF::UNKNOWN
-          when "2", "c" then
-            gelfentry['level'] = GELF::FATAL
-          when "3" then
-            gelfentry['level'] = GELF::ERROR
-          when "4", "w" then
-            gelfentry['level'] = GELF::WARN
-          # gelf-rb also skips notice
-          when "5", "n" then
-            gelfentry['level'] = GELF::INFO
-          when "6", "i" then
-            gelfentry['level'] = GELF::INFO
-          when "7", "d" then
-            gelfentry['level'] = GELF::DEBUG
-          when "e" then
-            if v.to_s.length >= 2 and v.to_s.downcase[1] != "r" then
-              gelfentry['level'] = GELF::UNKNOWN
-            else
-              gelfentry['level'] = GELF::ERROR
-            end
-          else
-            gelfentry['_level'] = v
-          end
-        when 'msec' then
-          # msec must be three digits (leading/trailing zeroes)
-          if conf[:add_msec_time] then
-            gelfentry['timestamp'] = "#{time.to_s}.#{v}".to_f
-          else
-            gelfentry['_msec'] = v
-          end
-        when 'short_message', 'full_message', 'facility', 'line', 'file' then
-          gelfentry[k] = v
-        else
-          if !k.start_with?('_')
-            gelfentry['_'+k] = v
-          else
-            gelfentry[k] = v
-          end
-        end
+      ensure_short_message(gelfentry)
+      gelfentry.compact
+    end
+
+    private
+
+    def parse_json_field(json_field)
+      return nil unless json_field
+      json = Oj.load(json_field.strip)
+      return nil unless json.is_a?(Hash)
+      json
+    end
+
+    def calculate_timestamp(time)
+      if defined?(Fluent::EventTime) && time.is_a?(Fluent::EventTime)
+        time.sec + (time.nsec.to_f / 1_000_000_000).round(3)
+      else
+        time
       end
+    end
 
-      if !gelfentry.key?('short_message') or gelfentry['short_message'].to_s.strip.empty? then
-        # allow other non-empty fields to masquerade as the short_message if it is unset
-        if gelfentry.key?('_message') and !gelfentry['_message'].to_s.strip.empty? then
-          gelfentry['short_message'] = gelfentry.delete('_message')
-        elsif gelfentry.key?('_msg') and !gelfentry['_msg'].to_s.strip.empty? then
-          gelfentry['short_message'] = gelfentry.delete('_msg')
-        elsif gelfentry.key?('_log') and !gelfentry['_log'].to_s.strip.empty? then
-          gelfentry['short_message'] = gelfentry.delete('_log')
-        elsif gelfentry.key?('_record') and !gelfentry['_record'].to_s.strip.empty? then
-          gelfentry['short_message'] = gelfentry.delete('_record')
-        else
-          # we must have a short_message, so provide placeholder
-          gelfentry['short_message'] = '(no message)'
-        end
+    def process_record_entry(k, v, conf, gelfentry)
+      case k
+      when 'host', 'hostname'
+        gelfentry['host'] = conf[:use_record_host] ? v : (gelfentry['_host'] = v)
+      when 'timestamp', 'time'
+        gelfentry['timestamp'] = parse_timestamp(v)
+      when 'level'
+        gelfentry['level'] = LEVEL_MAP[v.to_s.downcase[0]] || GELF::UNKNOWN
+      when 'msec'
+        gelfentry['timestamp'] = conf[:add_msec_time] ? "#{time.to_s}.#{v}".to_f : (gelfentry['_msec'] = v)
+      when 'short_message', 'version', 'full_message', 'facility', 'file', 'line'
+        gelfentry[k] = v
+      else
+        gelfentry[k.start_with?('_') ? k : "_#{k}"] = v
       end
+    end
+
+    def parse_timestamp(v)
+      return v if v.is_a?(Integer) || v.is_a?(Float)
+
+      DateTime.parse(v).strftime("%Q").to_f / 1_000 rescue v
+    end
 
-      # I realize the nulls are will be treated as unset keys, but it does
-      # tend to make for larger files and data transmissions.
-      return gelfentry.delete_if{ |k,v| v.nil? }
+    def ensure_short_message(gelfentry)
+      default_key = ['_message', '_msg', '_log', '_record'].find { |key| gelfentry[key]&.strip&.empty? == false }
+      gelfentry['short_message'] = default_key ? gelfentry.delete(default_key) : '(no message)'
     end
   end
 end

data/lib/fluent-plugin-gelf-best/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginGelfBest
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gelf-best
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Alex Yamauchi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd