fluent-plugin-gelf-best 1.3.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52f6ee827886a2037e01355541bc387a6bc057a9f1970801fe29c259fa0ac7e
-  data.tar.gz: e7e605395d0d741227ecbb8baa94fdfc091374c1a7e8ad3329581b211b74939d
+  metadata.gz: 2455a3682f22df246b829bbc986cbe28d784858160ed40b2f2e2543fe6619f1b
+  data.tar.gz: 98ea9ddf2c37ccad0b440fb1956d19cafaef6fd22d4adc8c4d80caab74a30fe1
 SHA512:
-  metadata.gz: 5afa18f1abaac29f41fbf61989e91c9dc59411567793d8f7f61aa1e6e8fce55fa4345f980338fea9ef54c9d07b2d4b74b12c8441e936d4c8331ba3daa9fde4b5
-  data.tar.gz: 5b7737f5468e6dfe9c9704473af10848d57b993d4cbd7699e6bdd8692f59e877fc5b3d6edf4161531ab6b3e4bf8484a098cd8b3ae647e0c963f92f5abbd14ede
+  metadata.gz: c39b5686fd08cf013b264febcc645fc79ab1df8b5cf9f63a62d800d32ac6ecde34efc70667508f047c882050f89460aa10e8c1aa6c57130d2e346ca785f6178c
+  data.tar.gz: 4fb1af6ee4509ea889a876b7af12819d82f71dc49582874023722e04817cd3eef72cacbd9742e62ea3874cff7fc1f2bdbd71f54bb0a2b6f6908480910b3844c3

data/README.md

@@ -27,6 +27,8 @@ For more info, review [Fluentd's official documentation](https://docs.fluentd.or
   host <remote GELF host>
   port <remote GELF port>
   protocol <tcp or udp (default)>
+  udp_transport_type <LAN or WAN(default)>
+  max_bytes <maximum message size (3200 default)>
   tls <true or false (default)>
   tls_options <{} (default)> for options see https://github.com/graylog-labs/gelf-rb/blob/72916932b789f7a6768c3cdd6ab69a3c942dbcef/lib/gelf/transport/tcp_tls.rb#L7-L12
   [ fluent buffered output plugin configuration ]

data/lib/fluent/plugin/formatter_gelf.rb

@@ -1,6 +1,6 @@
 require "fluent/plugin/formatter"
 require "fluent/plugin/gelf_plugin_util"
-require "yajl"
+require 'oj'
 
 module Fluent
   module TextFormatter
@@ -35,7 +35,7 @@ module Fluent
             }
           )
 
-          Yajl::Encoder.encode(make_gelfentry)
+          Oj.dump(gelfentry)
 
         rescue Exception => e
           log.error sprintf(

data/lib/fluent/plugin/gelf_plugin_util.rb

@@ -15,7 +15,7 @@ module Fluent
     }.freeze
 
     def make_gelfentry(tag, time, record, conf = {})
-      gelfentry = {'_fluentd_tag' => tag, 'timestamp' => calculate_timestamp(time)}
+      gelfentry = {'_fluentd_tag' => tag, 'timestamp' => time}
 
       record.each_pair do |k, v|
         gelfentry.merge!(process_record_entry(k, v, conf, gelfentry))
@@ -27,14 +27,6 @@ module Fluent
 
     private
 
-    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
-
     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

data/lib/fluent/plugin/out_gelf.rb

@@ -14,6 +14,7 @@ module Fluent
       config_param :host, :string, :default => nil
       config_param :port, :integer, :default => 12201
       config_param :protocol, :string, :default => 'udp'
+      config_param :udp_transport_type, :string, :default => 'WAN'
       config_param :tls, :bool, :default => false
       config_param :tls_options, :hash, :default => {}
 
@@ -45,11 +46,20 @@ module Fluent
         # a destination hostname or IP address must be provided
         raise Fluent::ConfigError.new("'host' parameter (hostname or address of Graylog2 server) is required") unless conf.has_key?('host')
 
+        # validate udp_transport_type if protocol is udp
+        if @protocol == 'udp'
+          unless %w[WAN LAN].include?(@udp_transport_type)
+            raise Fluent::ConfigError.new("'udp_transport_type' parameter should be either 'WAN' or 'LAN'")
+          end
+        end
+
         # choose protocol to pass to gelf-rb Notifier constructor
-        # (@protocol is used instead of conf['protocol'] to leverage config_param default)
-        if @protocol == 'udp' then @proto = GELF::Protocol::UDP
-        elsif @protocol == 'tcp' then @proto = GELF::Protocol::TCP
-        else raise Fluent::ConfigError.new("'protocol' parameter should be either 'udp' (default) or 'tcp'")
+        if @protocol == 'udp'
+          @proto = GELF::Protocol::UDP
+        elsif @protocol == 'tcp'
+          @proto = GELF::Protocol::TCP
+        else
+          raise Fluent::ConfigError.new("'protocol' parameter should be either 'udp' (default) or 'tcp'")
         end
       end
 
@@ -64,7 +74,7 @@ module Fluent
           options[:tls] = @tls_options
         end
 
-        @conn = GELF::Notifier.new(@host, @port, 'WAN', options)
+        @conn = GELF::Notifier.new(@host, @port, @udp_transport_type, options)
 
         # Errors are not coming from Ruby so we use direct mapping
         @conn.level_mapping = 'direct'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gelf-best
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.1
 platform: ruby
 authors:
 - Alex Yamauchi
 - Eric Searcy
-- Bartosz Michaliewicz
+- Bartosz Michalkiewicz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -18,28 +18,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: gelf
+  name: gelf_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -75,13 +89,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- fluent-plugin-gelf-best.gemspec
-- lib/fluent-plugin-gelf-best/version.rb
 - lib/fluent/plugin/formatter_gelf.rb
 - lib/fluent/plugin/gelf_plugin_util.rb
 - lib/fluent/plugin/out_gelf.rb

data/.gitignore

@@ -1,2 +0,0 @@
-**.gem
-**.gem.sha*

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/Rakefile

@@ -1,11 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.warning = false
-end
-
-task :default => :test

data/fluent-plugin-gelf-best.gemspec

@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fluent-plugin-gelf-best/version'
-
-Gem::Specification.new do |spec|
-  spec.name        = "fluent-plugin-gelf-best"
-  spec.version     = FluentPluginGelfBest::VERSION
-  spec.authors     = ["Alex Yamauchi", "Eric Searcy", "Bartosz Michaliewicz"]
-  spec.licenses       = ["Apache-2.0"]
-  spec.email          = ["bartosz.michalkiewicz@outlook.com"]
-
-  spec.summary     = "Sends Fluentd events Graylog2 by GELF"
-  spec.homepage    = "https://github.com/bmichalkiewicz/fluent-plugin-gelf-best"
-
-  spec.files      = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "fluentd", ">=1.0.0"
-  spec.add_runtime_dependency "gelf", ">= 3.1.0"
-  spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "rake"
-end

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

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