fluent-plugin-input-gelf 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72e348033187ca8353e8f0f458586e757f7ae49
-  data.tar.gz: b481677ab24fed18c12e90b0e0e01fb41a4f105a
+  metadata.gz: 7100acddd4910c56b36af50f13695d2773b4ff6b
+  data.tar.gz: e1d860e9bc6541e7b0a35afad2b7149eee717b7b
 SHA512:
-  metadata.gz: c0e9646e2608c25e9a6f2f3a198f27eb5b44034d5df2c388034f8c68ed5350f54e20d49a77d34d31418a9e81a156dc395b2129668f749fbff4b1f0474e59bf0c
-  data.tar.gz: 23524913869c9d57d8f1ea03f48fd0edfd5cb3828863513f4319b4150b22ff707ad16e1fa1ef21f494c010848bd03e0b3c7e8ca36d5d9c171a6a0b8add1efc18
+  metadata.gz: 9ae80360cd1ad43d94601711aae40b753cd78f2257d274554532af22d634ac1a5e92ac82a23757bd597307f5444ad9d559ded507a9af692ab66839df681a7c8b
+  data.tar.gz: cb307f962df7291b71e24a8f351bdb3266a3bd40ec7d392e94a5cd52add9fdb2e90259499de2d58e8c62bd3cc505e537ae715add132f27d4cad3eb6277da2d76

data/fluent-plugin-input-gelf.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
   gem.homepage    = "https://github.com/MerlinDMC/fluent-plugin-input-gelf"
   gem.summary     = gem.description
-  gem.version     = "0.1.0"
+  gem.version     = "0.1.1"
   gem.authors     = ["Daniel Malon"]
   gem.email       = "daniel.malon@me.com"
   gem.has_rdoc    = false

data/lib/fluent/plugin/in_gelf.rb

@@ -36,6 +36,8 @@ module Fluent
       end
     end
     config_param :blocking_timeout, :time, default: 0.5
+    desc 'Strip leading underscore'
+    config_param :strip_leading_underscore, :bool, default: true
 
     def configure(conf)
       super
@@ -86,6 +88,9 @@ module Fluent
         # Use the recorded event time if available
         time = record.delete('timestamp').to_i if record.key?('timestamp')
 
+        # Postprocess recorded event
+        strip_leading_underscore(record) if @strip_leading_underscore
+
         emit(time, record)
       }
     rescue => e
@@ -109,5 +114,14 @@ module Fluent
     rescue => e
       log.error 'gelf failed to emit', error: e.to_s, error_class: e.class.to_s, tag: @tag, record: Yajl.dump(record)
     end
+
+    private
+
+    def strip_leading_underscore(record)
+      record.keys.each { |k|
+        next unless k[0,1] == '_'
+        record[k[1..-1]] = record.delete(k)
+      }
+    end
   end
 end

data/test/plugin/test_in_gelf.rb

@@ -69,4 +69,53 @@ class GelfInputTest < Test::Unit::TestCase
       }
     }
   end
+
+  def test_strip_leading_underscore
+    configs = {'127.0.0.1' => CONFIG}
+    # gelf-rb currently does not support IPv6 over UDP
+    # configs.merge!('::1' => IPv6_CONFIG) if ipv6_enabled?
+
+    configs.each_pair { |k, v|
+      d = create_driver(v)
+
+      tests = [
+        {:given =>
+         {
+           :timestamp => 12345,
+           :short_message => 'short message',
+           :full_message => 'full message',
+           '_custom_field' => 12345
+         },
+         :expected =>
+         {
+           'short_message' => 'short message',
+           'full_message' => 'full message',
+           'custom_field' => 12345
+         }
+        }
+      ]
+
+      d.run do
+        n = GELF::Notifier.new(k, PORT)
+
+        tests.each { |test|
+          n.notify!(test[:given])
+        }
+
+        sleep 1
+      end
+
+      emits = d.emits
+      assert_equal tests.length, emits.length, 'missing emitted events'
+      emits.each_index { |i|
+        puts emits[i].to_s
+        assert_equal 'gelf', emits[i][0]
+        assert_equal tests[i][:timestamp].to_i, emits[i][1] unless tests[i][:timestamp].nil?
+        assert_block "expectation not met: #{tests[i][:expected]}" do
+          emits[i][2].merge(tests[i][:expected]) == emits[i][2]
+        end
+      }
+    }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-input-gelf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Daniel Malon