fluent-plugin-gelf-best 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7327c66aa6fddfe60ed1448e76a59ecd906b458957758b748ee3162aefa85d0f
-  data.tar.gz: 2f5b1820ab88ce8665288b2e218e8be53aa274d5047e32cde33faaa5dad967c6
+  metadata.gz: a52f6ee827886a2037e01355541bc387a6bc057a9f1970801fe29c259fa0ac7e
+  data.tar.gz: e7e605395d0d741227ecbb8baa94fdfc091374c1a7e8ad3329581b211b74939d
 SHA512:
-  metadata.gz: 2735ce20d4dc4405d137405a30ec2c52dc83343fae9fdb7312f35e1b671546bd95ce0ab1c93648deaa1e0175fcedb79df739596aaedb27e767135695169a1ec5
-  data.tar.gz: 4add4d31fc40b78c7ff70450b556749e755f0fa6072e62a24160c4afa8ae63f09f4a46c2e2a7d26e876bb9379b65264787da37a603aa807e5dd0489c092416af
+  metadata.gz: 5afa18f1abaac29f41fbf61989e91c9dc59411567793d8f7f61aa1e6e8fce55fa4345f980338fea9ef54c9d07b2d4b74b12c8441e936d4c8331ba3daa9fde4b5
+  data.tar.gz: 5b7737f5468e6dfe9c9704473af10848d57b993d4cbd7699e6bdd8692f59e877fc5b3d6edf4161531ab6b3e4bf8484a098cd8b3ae647e0c963f92f5abbd14ede

data/.gitignore

@@ -1,4 +1,2 @@
-/certs/*key*
-/certs/*priv*
 **.gem
 **.gem.sha*

data/fluent-plugin-gelf-best.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "fluentd", ">=1.0.0"
-  spec.add_runtime_dependency "gelf", ">= 2.0.0"
-  spec.add_development_dependency "oj", "~> 3.3.10"
+  spec.add_runtime_dependency "gelf", ">= 3.1.0"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "rake"
 end

data/lib/fluent/plugin/formatter_gelf.rb

@@ -16,6 +16,7 @@ module Fluent
 
       config_param :use_record_host, :bool, :default => true
       config_param :add_msec_time, :bool, :default => false
+      config_param :max_bytes, :integer, :default => 32000
 
       def configure(conf)
         super(conf)
@@ -29,7 +30,8 @@ module Fluent
             tag,time,record,
             {
               :use_record_host => @use_record_host,
-              :add_msec_time => @add_msec_time
+              :add_msec_time => @add_msec_time,
+              :max_bytes => @max_bytes
             }
           )
 

data/lib/fluent/plugin/gelf_plugin_util.rb

@@ -1,26 +1,24 @@
-require 'oj'
-require 'date'
-require 'gelf'
-
 module Fluent
   module GelfPluginUtil
+    require "gelf"
+    require "date"
 
     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
+      "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  # assuming 'e' stands typically for 'error'
     }.freeze
 
     def make_gelfentry(tag, time, record, conf = {})
-      gelfentry = {"_fluentd_tag" => tag, "timestamp" => calculate_timestamp(time)}
+      gelfentry = {'_fluentd_tag' => tag, 'timestamp' => calculate_timestamp(time)}
 
-      record.each do |k, v|
-        process_record_entry(k, v, conf, gelfentry)
+      record.each_pair do |k, v|
+        gelfentry.merge!(process_record_entry(k, v, conf, gelfentry))
       end
 
       ensure_short_message(gelfentry)
@@ -38,31 +36,48 @@ module Fluent
     end
 
     def process_record_entry(k, v, conf, gelfentry)
+      # Truncate values longer than max_bytes
+      v = (v.respond_to?(:bytesize) && v.bytesize > conf[:max_bytes]) ? "#{v.byteslice(0, conf[:max_bytes] - 3)}..." : v
+
       case k
       when 'host', 'hostname'
-        gelfentry['host'] = conf[:use_record_host] ? v : (gelfentry['_host'] = v)
+        return {'host' => (conf[:use_record_host] ? v : gelfentry['_host'] = v)}
       when 'timestamp', 'time'
-        gelfentry['timestamp'] = parse_timestamp(v)
+        { 'timestamp' => parse_timestamp(v) }
       when 'level'
-        gelfentry['level'] = LEVEL_MAP[v.to_s.downcase[0]] || GELF::UNKNOWN
+        {'level' => LEVEL_MAP[v.to_s.downcase[0]] || (v.to_s.length >= 2 && v.to_s.downcase[1] != "r" ? GELF::UNKNOWN : v)}
       when 'msec'
-        gelfentry['timestamp'] = conf[:add_msec_time] ? "#{time.to_s}.#{v}".to_f : (gelfentry['_msec'] = v)
+        conf[:add_msec_time] ? {'timestamp' => "#{time.to_s}.#{v}".to_f} : {'_msec' => v}
       when 'short_message', 'version', 'full_message', 'facility', 'file', 'line'
-        gelfentry[k] = v
+        {k => v}
       else
-        gelfentry[k.start_with?('_') ? k : "_#{k}"] = v
+        {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
+      if v.is_a?(Integer) || v.is_a?(Float)
+        v
+      else
+        begin
+          (DateTime.parse(v).strftime("%Q").to_f / 1_000).round(3)
+        rescue ArgumentError
+          v
+        end
+      end
     end
 
     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)'
+      return if gelfentry['short_message'] && !gelfentry['short_message'].to_s.strip.empty?
+
+      ['_message', '_msg', '_log', '_record'].each do |key|
+        if gelfentry[key] && !gelfentry[key].to_s.strip.empty?
+          gelfentry['short_message'] = gelfentry.delete(key)
+          return
+        end
+      end
+
+      gelfentry['short_message'] = '(no message)' unless gelfentry['short_message']
     end
   end
 end

data/lib/fluent/plugin/out_gelf.rb

@@ -10,6 +10,7 @@ module Fluent
 
       config_param :use_record_host, :bool, :default => false
       config_param :add_msec_time, :bool, :default => false
+      config_param :max_bytes, :integer, :default => 32000
       config_param :host, :string, :default => nil
       config_param :port, :integer, :default => 12201
       config_param :protocol, :string, :default => 'udp'
@@ -87,7 +88,8 @@ module Fluent
             tag,timestamp,record,
             {
               :use_record_host => @use_record_host,
-              :add_msec_time => @add_msec_time
+              :add_msec_time => @add_msec_time,
+              :max_bytes => @max_bytes
             }
           ).to_msgpack
         rescue Exception => e

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

@@ -1,3 +1,3 @@
 module FluentPluginGelfBest
-  VERSION = "1.3.2"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gelf-best
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Alex Yamauchi
 - Eric Searcy
 - Bartosz Michaliewicz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -32,28 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.10
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +68,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - bartosz.michalkiewicz@outlook.com
 executables: []
@@ -94,7 +80,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- certs/oss@hotschedules.com.cert
 - fluent-plugin-gelf-best.gemspec
 - lib/fluent-plugin-gelf-best/version.rb
 - lib/fluent/plugin/formatter_gelf.rb
@@ -104,7 +89,7 @@ homepage: https://github.com/bmichalkiewicz/fluent-plugin-gelf-best
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Sends Fluentd events Graylog2 by GELF
 test_files: []

data/certs/oss@hotschedules.com.cert

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIELzCCAxGgAwIBAgIJAMOoRmNuvAZcMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
-aXNjbzEVMBMGA1UECgwMSG90c2NoZWR1bGVzMQ4wDAYDVQQLDAVJbmZyYTEfMB0G
-A1UEAwwWaW5mcmEuaG90c2NoZWR1bGVzLmNvbTEjMCEGCSqGSIb3DQEJARYUb3Nz
-QGhvdHNjaGVkdWxlcy5jb20wHhcNMTcwMjE4MDA1NDU4WhcNMjEwMjE4MDA1NDU4
-WjCBpzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
-DVNhbiBGcmFuY2lzY28xFTATBgNVBAoMDEhvdHNjaGVkdWxlczEOMAwGA1UECwwF
-SW5mcmExHzAdBgNVBAMMFmluZnJhLmhvdHNjaGVkdWxlcy5jb20xIzAhBgkqhkiG
-9w0BCQEWFG9zc0Bob3RzY2hlZHVsZXMuY29tMIIBKDANBgkqhkiG9w0BAQEFAAOC
-ARUAMIIBEAKCAQcAutTytHjHFb5yK/29POqMS3DyxRSRRbKvBus/rEL3reeKDVlf
-eO9a/9U3oUcxHFHeISF9uOBSvL88svxhLqxkKLVA0vMbVgDFoGsOlh93nA5Lmw+H
-SEzG3+Z6JqH8YfAIqVyp1nZcdtC7u8xYpDD65ayjRALLuvOUXORGeqgedlgiwwLp
-2tZ7A9tCzBZnDjcNenD8zXLCOdRjJiBPq/XQS9h4POWvpom0z+jyUkRj3ojqOoXW
-bKKdXzdZ3s5BSwgxlWJo+lK/50+xLpjJe4mEJwySkrluy8GOG/UR/j+Y4I1j1FbY
-RwT9SUSairjh0zgiDC0LTjAJBIenuxxuM9jhRyoiu+YYVwIDAQABo1AwTjAdBgNV
-HQ4EFgQUtlFsvLIJ59o2GyoRTXKEIPEgnn8wHwYDVR0jBBgwFoAUtlFsvLIJ59o2
-GyoRTXKEIPEgnn8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQcAdELJ
-QdrR55Xak3q5IhLnIdOLJC6ZEdHI2173SSmytInyDX6fe9uZION4I9WCCm/hCp+t
-QILh4feu14iDWmBxzy6F6tiyuEjhaU5Ud9wZ/YDBQhP2AHquoPAufxXZAUFlA5er
-wIYVupToBrWavfbjgRqRHAZ6vwrLwoIiomh2/wv06HLrFmSzj5q6BVp7FFMKDail
-QWzJ4aQl786RMwPa776eVaKQTmQuTUUppvhVq9QdKyxwGPibAYGbYKZwmmtx+BV2
-GJevNV8BSuhh6m2AHCxEzMaD7WKNbewTTgGLUlvppaR9SE2V/yUZ7x1Vp8/mGeO6
-2Zk648Ep9HVPKmwoVuB75+xEQw==
------END CERTIFICATE-----