fluent-plugin-dockergelf 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d551daf23d38ef5a9e9f670bce966aa5cb6965
-  data.tar.gz: d492a6e90789159adf8a032d3b2a042f622e4c42
+  metadata.gz: 1c0fd8c13c677bd27f4aa1792d106ef6c11b4fc2
+  data.tar.gz: 907236a5f5ad96678ade19fdaf0d259a28450ff3
 SHA512:
-  metadata.gz: 533d32c7f704e6b750395e43dddbc1d156b38df88902ee7086367a5c168c4bf94692a1185cb53d44733c35f21290e92f0e95c1f7e95a8454b811ed4e43972251
-  data.tar.gz: aaddabb64e8fa8b713786c3b0d28a967a34cd59229125ad347ca7548fe5f8a6bb996f106a4722f610b6be8d8f0a50dc58963963c5027ae5ca6b184221faccb92
+  metadata.gz: db29916cd4452b091fa577ebd59c56b066acc9ac81bf401ab35a1a475266eeb58b34dca01e73a6be090d9da66dc265b2cde67b45acb52c9d96ea5183332b6f38
+  data.tar.gz: c1afec5c183ce0a91deefb50583bf41073e72b13c9d1f8d4007c5770eeadeb77a578d61215ec91e4951d231d2035f8b4a9c5623541fbf4c24944459a786c264e

data/lib/fluent/plugin/filter_dockergelf.rb

@@ -20,11 +20,20 @@ module Fluent
             content_hash.delete("version")
             msg = content_hash["short_message"]
             content_hash.delete("short_message")
-            content_hash.each do |key ,value|
-              if key == "timestamp"
-                rettime = Fluent::EventTime.from_time(Time.at(value))
+            if content_hash.has_key?("full_message")
+              msg = msg + ":" + content_hash["full_message"]
+              content_hash.delete("full_message")
+            end
+            if content_hash.has_key?("timestamp")
+              rettime = Fluent::EventTime.from_time(Time.at(content_hash["timestamp"]))
+              content_hash.delete("timestamp")
+            end
+            content_hash.each do |key, value|
+              prefix = key[0]
+              if prefix == "_"
+                record[key[1..-1]] = value
               else
-                record[key]=value
+                record[key] = value
               end
             end
             record["log"] = msg

data/test/plugin/test_filter_dockergelf.rb

@@ -47,7 +47,7 @@ class DockergelfFilterTest < Test::Unit::TestCase
       conf = CONFIG
       time = event_time('2018-10-20T00:00:00.123Z')
       logtime=Time.at(time.to_f).iso8601(3).to_s
-      message = {"log" => '{"_instance_id":"","_microservice_id":"","host":"","level":4,"short_message":"somemsg","timestamp":1539143207.2754333,"version":"1.1"}',
+      message = {"log" => '{"_instance_id":"abc","_microservice_id":"","host":"","level":4,"short_message":"somemsg","timestamp":1539143207.2754333,"version":"1.1","full_message":"aaa"}',
                   "stream" => 'stderr'
       }
       filtered_record = filterWithTime(conf, time, message)[0]
@@ -55,7 +55,8 @@ class DockergelfFilterTest < Test::Unit::TestCase
       assert_equal(logtime, filtered_record["logtime"])
       assert_equal(4, filtered_record["level"])
       assert_equal("stderr", filtered_record["stream"])
-      assert_equal("somemsg", filtered_record["log"])
+      assert_equal("somemsg:aaa", filtered_record["log"])
+      assert_equal("abc", filtered_record["instance_id"])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dockergelf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Bo Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,14 +80,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
-- Gemfile.lock
-- README.md
-- Rakefile
-- fluent-plugin-dockergelf.gemspec
 - lib/fluent/plugin/filter_dockergelf.rb
-- test/helper.rb
 - test/plugin/test_filter_dockergelf.rb
 homepage: https://gitlab.apphub.ericsson.net/bo-test-group/fluent-plugin-dockergelf
 licenses:
@@ -114,5 +107,4 @@ signing_key:
 specification_version: 4
 summary: Handles gelf log in docker/kubenetes
 test_files:
-- test/helper.rb
 - test/plugin/test_filter_dockergelf.rb

data/.gitignore

@@ -1,2 +0,0 @@
-pkg/
-.idea/

data/Gemfile

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

data/Gemfile.lock

@@ -1,50 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-dockergelf (0.2.2)
-      fluentd (>= 0.14.10, < 2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    cool.io (1.5.3)
-    dig_rb (1.0.1)
-    fluentd (1.3.3)
-      cool.io (>= 1.4.5, < 2.0.0)
-      dig_rb (~> 1.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
-      sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (~> 1.0)
-      tzinfo-data (~> 1.0)
-      yajl-ruby (~> 1.0)
-    http_parser.rb (0.6.0)
-    msgpack (1.2.6)
-    power_assert (1.1.3)
-    rake (12.3.1)
-    serverengine (2.1.0)
-      sigdump (~> 0.2.2)
-    sigdump (0.2.4)
-    strptime (0.2.3)
-    test-unit (3.2.8)
-      power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.9)
-      tzinfo (>= 1.0.0)
-    yajl-ruby (1.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.14)
-  fluent-plugin-dockergelf!
-  rake (~> 12.0)
-  test-unit (~> 3.0)
-
-BUNDLED WITH
-   1.17.1

data/README.md

@@ -1,53 +0,0 @@
-# fluent-plugin-dockergelf
-
-[Fluentd](https://fluentd.org/) filter plugin to handle gelf format log in docker(kubenetes)
-
-The log looks like 
-```
-{"log":"{"_instance_id":"","_microservice_id":"","host":"","level":4,"short_message":"Some log information.","timestamp":1539143207.2754333,"version":"1.1"}","stream":"stderr","time":"2018-10-10T05:05:17.102912076Z"}
-```
-This filter will use the timestamp inside as the timestamp. create a new field called logtime as the timestamp from the docker. move the short_message to the log field.
-
-The latest kubernetes_metadata filter does not support the inner json process anymore. So this filter is recommended to put between detect_exceptions and kubernetes_metadata. 
-```
-    <filter kubernetes.**>
-      @type dockergelf
-    </filter>
-```
-
-## Installation
-
-### RubyGems
-
-```
-$ gem install fluent-plugin-dockergelf
-```
-
-### Bundler
-
-Add following line to your Gemfile:
-
-```ruby
-gem "fluent-plugin-dockergelf"
-```
-
-And then execute:
-
-```
-$ bundle
-```
-
-## Release new version
-
-You can release new version of this plugin:
-
-```
-$ rake release
-```
-gem is pushed to https://rubygems.org/gems/fluent-plugin-dockergelf
-
-
-## Copyright
-
-* Copyright(c) 2018- Ericsson AB
-

data/Rakefile

@@ -1,13 +0,0 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
-
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs.push("lib", "test")
-  t.test_files = FileList["test/**/test_*.rb"]
-  t.verbose = true
-  t.warning = true
-end
-
-task default: [:test]

data/fluent-plugin-dockergelf.gemspec

@@ -1,27 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |spec|
-  spec.name    = "fluent-plugin-dockergelf"
-  spec.version = "0.2.2"
-  spec.authors = ["Bo Zhang"]
-  spec.email   = ["bo.b.zhang@ericsson.com"]
-
-  spec.summary       = %q{Handles gelf log in docker/kubenetes}
-  spec.description   = %q{Will put docker log time as new field logtime, and use the timestamp in gelf}
-  spec.homepage      = "https://gitlab.apphub.ericsson.net/bo-test-group/fluent-plugin-dockergelf"
-  spec.license       = "Ericsson"
-
-  test_files, files  = `git ls-files -z`.split("\x0").partition do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.files         = files
-  spec.executables   = files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = test_files
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
-end

data/test/helper.rb

@@ -1,8 +0,0 @@
-$LOAD_PATH.unshift(File.expand_path("../../", __FILE__))
-require "test-unit"
-require "fluent/test"
-require "fluent/test/driver/filter"
-require "fluent/test/helpers"
-
-Test::Unit::TestCase.include(Fluent::Test::Helpers)
-Test::Unit::TestCase.extend(Fluent::Test::Helpers)