fluent-plugin-gelf-better 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 4a3244acd8cf559d3c5ad27efef0b8e030bea569fe508c7ae5b695c236bb8cf2
+  data.tar.gz: 7124ba142297a2862ebca722f0bd5ed1947d8db20231f6e0aa8356479e6216a0
+SHA512:
+  metadata.gz: b13201be65c3faeee8a3ba8bedf0952927979c07543be8a6440343c83991a17e1d702ec59009273a13213ad11c6e30bc08987782792fddb3e2a9bc7d4b63b92b
+  data.tar.gz: f7ba5754b1b90437ead2bb8e3331bc6ed19c6f6317ca8986d7bae6d03b36ea170a7f04bacf3b887b45a008b06466cd598fa323576fcaf38e18db2b867968f68a

data/.gitignore

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

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-gelf-hs (1.0.3)
+      fluentd
+      gelf (>= 2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.1.5)
+    cool.io (1.5.4)
+    dig_rb (1.0.1)
+    fluentd (1.7.4)
+      cool.io (>= 1.4.5, < 2.0.0)
+      dig_rb (~> 1.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 1.2.0, < 2.0.0)
+      serverengine (>= 2.0.4, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (>= 0.2.2, < 1.0.0)
+      tzinfo (~> 2.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    gelf (3.1.0)
+      json
+    http_parser.rb (0.6.0)
+    json (2.2.0)
+    msgpack (1.3.1)
+    power_assert (1.1.5)
+    rake (13.0.1)
+    serverengine (2.2.0)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.2.3)
+    test-unit (3.3.4)
+      power_assert
+    tzinfo (2.0.0)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fluent-plugin-gelf-hs!
+  rake
+  test-unit
+
+BUNDLED WITH
+   1.17.3

data/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2017 Red Book Connect LLC. operating as HotSchedules
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.

data/LICENSE-Apache-2.0.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -0,0 +1,32 @@
+# Fluentd GELF output and formatter plugins
+This is a fork of the fluent-plugin-gelf (https://github.com/emsearcy/fluent-plugin-gelf) created in order to publish a gem with the changes contained in pull request #34.  The original pull request #34 will not be used, due to some problems discovered, and will be replaced by three smaller PRs which will implement the same change set, albeit in smaller chunks.
+
+## Overview
+Fluentd GELF output and formatter plugins.
+
+## Installation
+```bash
+gem install fluent-plugin-gelf-hs
+```
+
+## Output plugin configuration
+```
+<match **>
+  type gelf
+  host <remote GELF host>
+  port <remote GELF port>
+  protocol <tcp or udp (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 ]
+</match>
+```
+
+## Formatter plugin configuration
+```
+<match **>
+  type file (any type that that takes a format argument)
+  format gelf
+  [ fluent file output plugin configuration ]
+</match>
+```

data/Rakefile

@@ -0,0 +1,11 @@
+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/certs/oss@hotschedules.com.cert

@@ -0,0 +1,25 @@
+-----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-----

data/fluent-plugin-gelf-hs.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "fluent-plugin-gelf-better"
+  s.version   = ENV.key?('RUBYGEM_VERSION') ? ENV['RUBYGEM_VERSION'] : '1.0.3'
+  s.authors     = ["Alex Yamauchi", "Eric Searcy"]
+  s.email       = ["oss@hotschedules.com"]
+  s.homepage    = "https://github.com/bodhi-space/fluent-plugin-gelf-hs"
+  s.summary     = "Buffered fluentd output plugin to GELF (Graylog2)"
+  # When building gems, there is always a stupid warning message thrown
+  # if the summary and description are identical.
+  s.description = s.summary + '.'
+  s.licenses    = ["Apache-2.0"]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency "test-unit"
+  s.add_development_dependency "rake"
+  s.add_runtime_dependency "fluentd"
+  s.add_runtime_dependency "gelf", ">= 2.0.0"
+end

data/lib/fluent/gelf_util.rb

@@ -0,0 +1,104 @@
+# encoding=utf-8
+module Fluent
+  module GelfUtil
+
+    require 'gelf'
+
+    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
+      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
+      end
+
+      if !gelfentry.key?('short_message') or gelfentry['short_message'].to_s.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.empty? then
+          gelfentry['short_message'] = gelfentry.delete('_message')
+        elsif gelfentry.key?('_msg') and !gelfentry['_msg'].to_s.empty? then
+          gelfentry['short_message'] = gelfentry.delete('_msg')
+        elsif gelfentry.key?('_log') and !gelfentry['_log'].to_s.empty? then
+          gelfentry['short_message'] = gelfentry.delete('_log')
+        elsif gelfentry.key?('_record') and !gelfentry['_record'].to_s.empty? then
+          gelfentry['short_message'] = gelfentry.delete('_record')
+        else
+          # we must have a short_message, so provide placeholder
+          gelfentry['short_message'] = '(no message)'
+        end
+      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? }
+
+    end
+
+    def make_json(gelfentry,conf)
+      gelfentry['version'] = '1.0'
+
+      gelfentry.each_pair  do |k,v|
+        if v.is_a?(String)
+          gelfentry[k] = v.force_encoding('UTF-8')
+        end
+      end
+
+      gelfentry.to_json + ( conf.is_a?(Hash) and conf.key?(:record_separator) ? conf[:record_separator] : "\0" )
+    end
+  end
+end

data/lib/fluent/plugin/formatter_gelf.rb

@@ -0,0 +1,48 @@
+require 'fluent/formatter'
+
+module Fluent
+  module TextFormatter
+    class GELFFormatter < Formatter
+
+      unless method_defined?(:log)
+        define_method('log') { $log }
+      end
+
+      Plugin.register_formatter("gelf", self)
+
+      require 'fluent/gelf_util'
+      include GelfUtil
+
+      config_param :use_record_host, :bool, :default => true
+      config_param :add_msec_time, :bool, :default => false
+
+      def configure(conf)
+        super(conf)
+      end
+
+      def format(tag, time, record)
+
+        begin
+
+          gelfentry = make_gelfentry(
+            tag,time,record,
+            {
+              :use_record_host => @use_record_host,
+              :add_msec_time => @add_msec_time
+            }
+          )
+
+          make_json(gelfentry,{})
+      
+        rescue Exception => e
+          log.error sprintf(
+            'Error trying to serialize %s: %s',
+            record.to_s.force_encoding('UTF-8'),
+            e.message.to_s.force_encoding('UTF-8')
+          )
+        end
+      end
+
+    end
+  end
+end

data/lib/fluent/plugin/out_gelf.rb

@@ -0,0 +1,108 @@
+module Fluent
+
+  class GELFOutput < BufferedOutput
+
+    unless method_defined?(:log)
+      define_method('log') { $log }
+    end
+
+    Plugin.register_output("gelf", self)
+
+    require 'gelf'
+    require 'fluent/gelf_util'
+    include GelfUtil
+
+    config_param :use_record_host, :bool, :default => false
+    config_param :add_msec_time, :bool, :default => false
+    config_param :host, :string, :default => nil
+    config_param :port, :integer, :default => 12201
+    config_param :protocol, :string, :default => 'udp'
+    config_param :tls, :bool, :default => false
+    config_param :tls_options, :hash, :default => {}
+
+    def initialize
+      super
+    end
+
+    def configure(conf)
+      super(conf)
+
+      # a destination hostname or IP address must be provided
+      raise ConfigError, "'host' parameter (hostname or address of Graylog2 server) is required" unless conf.has_key?('host')
+
+      # 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 ConfigError, "'protocol' parameter should be either 'udp' (default) or 'tcp'"
+      end
+    end
+
+    def start
+      super
+
+      options = {:facility => 'fluentd', :protocol => @proto}
+
+      # add tls key (tls_options) only when tls = True
+      # see https://github.com/graylog-labs/gelf-rb/blob/72916932b789f7a6768c3cdd6ab69a3c942dbcef/lib/gelf/notifier.rb#L133-L140
+      if @tls then
+        options[:tls] = @tls_options
+      end
+
+      @conn = GELF::Notifier.new(@host, @port, 'WAN', options)
+
+      # Errors are not coming from Ruby so we use direct mapping
+      @conn.level_mapping = 'direct'
+      # file and line from Ruby are in this class, not relevant
+      @conn.collect_file_and_line = false
+    end
+
+    def shutdown
+      super
+    end
+
+    def format(tag, time, record)
+      if defined? Fluent::EventTime and time.is_a? Fluent::EventTime then
+        timestamp = time.to_i + (time.nsec.to_f/1000000000).round(3)
+      else
+        timestamp = time.to_i
+      end
+
+      begin
+        make_gelfentry(
+          tag,timestamp,record,
+          {
+            :use_record_host => @use_record_host,
+            :add_msec_time => @add_msec_time
+          }
+        ).to_msgpack
+      rescue Exception => e
+        log.error sprintf(
+          'Error trying to serialize %s: %s',
+          record.to_s.force_encoding('UTF-8'),
+          e.message.to_s.force_encoding('UTF-8')
+        )
+      end
+
+    end
+
+    def write(chunk)
+      chunk.msgpack_each do |data|
+        begin
+          @conn.notify!(data)
+        rescue Exception => e
+          log.warn "failed to flush the buffer.", error_class: e.class.to_s, error: e.to_s, plugin_id: plugin_id
+          raise e
+        end
+
+      end
+    end
+
+    def formatted_to_msgpack_binary
+      true
+    end
+  end
+
+end
+
+# vim: sw=2 ts=2 et

data/test/plugin/test_formatter_gelf.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class GELFFormatterTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONF = %[
+  ]
+
+  def create_driver(conf = CONF)
+    Fluent::Test::FormatterTestDriver.new(Fluent::TextFormatter::GELFFormatter).configure(conf)
+  end
+
+  def test_configure
+    d = create_driver
+    assert_true d.instance.use_record_host
+    assert_false d.instance.add_msec_time
+  end
+
+  def test_format
+    d = create_driver
+    time = Time.now.to_i
+    formatted = d.format('tag', time, {"message" => "gelf"})
+    expected = Yajl.dump({"_tag"          => "tag",
+                          "timestamp"     => time,
+                          "short_message" => "gelf",
+                          "version"       => "1.0"}) + "\0"
+    assert_equal expected, formatted
+  end
+end

data/test/plugin/test_out_gelf.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class GELFOutputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONF = %[
+    host localhost
+  ]
+
+  def create_driver(conf = CONF)
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::GELFOutput).configure(conf) do
+      def write(chunk)
+        chunk.read
+      end
+    end
+  end
+
+  def test_configure
+    d = create_driver
+    assert_false d.instance.use_record_host
+    assert_false d.instance.add_msec_time
+    assert_equal 'localhost', d.instance.host
+    assert_equal 12201, d.instance.port
+    assert_equal 'udp', d.instance.protocol
+    assert_false d.instance.tls
+    assert_true d.instance.tls_options.empty?
+  end
+
+  def test_format
+    d = create_driver
+    time = Time.now
+    d.emit({"message" => "gelf"}, time.to_i)
+    d.expect_format({'_tag' => 'test', 'timestamp' => time.to_i, 'short_message' => 'gelf'}.to_msgpack)
+    d.run
+  end
+
+  def test_write
+    d = create_driver
+    time = Time.now
+    d.emit({"message" => "gelf"}, time.to_i)
+    d.run
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'test/unit'
+require 'fluent/test'
+require 'fluent/plugin/out_gelf'
+require 'fluent/plugin/formatter_gelf'

metadata

@@ -0,0 +1,118 @@
+--- !ruby/object:Gem::Specification
+name: fluent-plugin-gelf-better
+version: !ruby/object:Gem::Version
+  version: 1.0.3
+platform: ruby
+authors:
+- Alex Yamauchi
+- Eric Searcy
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2019-11-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fluentd
+  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: gelf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+description: Buffered fluentd output plugin to GELF (Graylog2).
+email:
+- oss@hotschedules.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- LICENSE-Apache-2.0.txt
+- README.md
+- Rakefile
+- certs/oss@hotschedules.com.cert
+- fluent-plugin-gelf-hs.gemspec
+- lib/fluent/gelf_util.rb
+- lib/fluent/plugin/formatter_gelf.rb
+- lib/fluent/plugin/out_gelf.rb
+- test/plugin/test_formatter_gelf.rb
+- test/plugin/test_out_gelf.rb
+- test/test_helper.rb
+homepage: https://github.com/bodhi-space/fluent-plugin-gelf-hs
+licenses:
+- Apache-2.0
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.0.4
+signing_key: 
+specification_version: 4
+summary: Buffered fluentd output plugin to GELF (Graylog2)
+test_files:
+- test/plugin/test_formatter_gelf.rb
+- test/plugin/test_out_gelf.rb
+- test/test_helper.rb