fluent-plugin-bunyan 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c7ca077c27fc89eada5a3b8854ae9ac6b16a26503d73fa5690f4b8ed423d77c
-  data.tar.gz: 35fe59d48c1c8dabe0c22900ff203e46884fb0b21125e7a8799399b70f3a3fe8
+  metadata.gz: 897084b1f198fcdf65487558092d7ff3a0c61d55a60f3b7e7cafe983a3c88e37
+  data.tar.gz: 87e400a29faaa103b766e585bc8bc368829878feef22f2efe32ab8afec52a8f7
 SHA512:
-  metadata.gz: e4854c127c3a0903daa6b604f2b347c9bea23f9fe202fad1c10779b340efc177459cb34552f35a50c713f36241fd9e2204cd64bd7b55dcc75dd744cd5f876a86
-  data.tar.gz: 44b4796655c0985988e9683a71ce0a849c9cb4d45ad075267ff790f542bb7022c1c41b28690e47de42ac5c703a2a05b6dd6be69cb86102ee7e130c1d05bf4353
+  metadata.gz: e369516e341686750d853796d384b111f1bdfc0b24891a64b3cfba11cc156720764bdd56c16647379d6ea192f64692af5b038b6948eebd6fd684873e41ff1d22
+  data.tar.gz: f7c5979bd8c869151b3c9e0e8f06a0808e168c26a44b5edc68ed7055e28890646dbeaeb43bd65502b2b45f11b19678641a9c99ed71332bcc11bafc4b58ed9ca7

data/fluent-plugin-bunyan.gemspec

@@ -3,7 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-bunyan"
-  spec.version = "0.0.4"
+  #spec.version = Fluent::Plugin::BunyanParser.new.version
+  spec.version = "0.0.5"
   spec.authors = ["Gildas Cherruel"]
   spec.email   = ["gildas@breizh.org"]
 

data/lib/fluent/plugin/parser_bunyan.rb

@@ -26,11 +26,22 @@ module Fluent
       end
 
       def parse(text)
-        # Example of a log line we want to get stuff from:
+        # Example of a log line from containerd we want to get stuff from:
         # 2020-03-16T22:14:05.710251038+09:00 stdout F {"UserAgent":"kube-probe/1.17","hostname":"helloworld-go-helloworld-5649dfd7bd-k8954","level":30,"msg":"request start: GET /","name":"helloworld","pid":1,"remote":"10.1.10.1:60114","reqid":"e4745ed6-82d4-4013-aeda-1d02bef42331","scope":"/","tid":17,"time":"2020-03-16T13:14:05Z","topic":"route","v":0}
+        # Example of a log line from docker for mac we want to get stuff from:
+        # {"log":"{\"UserAgent\":\"HTTPie/2.0.0\",\"hostname\":\"helloworld-859745b47d-5dlbn\",\"level\":30,\"msg\":\"request start: GET /\",\"name\":\"helloworld\",\"pid\":1,\"remote\":\"192.168.65.3:42018\",\"reqid\":\"ba054f49-d97e-4970-89c4-dd3b75270e6a\",\"scope\":\"/\",\"tid\":14,\"time\":\"2020-03-24T08:29:02Z\",\"topic\":\"route\",\"v\":0}\n","stream":"stdout","time":"2020-03-24T08:29:02.3995324Z"}
         if text =~ /[^{]*({.*)/
           super(text.sub(/[^{]*({.*)/, '\1')) do |time, record|
             if record then
+              if record["log"] then # This is a Docker style log message
+                begin
+                  r = JSON.load(record["log"])
+                  r.delete("time")
+                  record.merge!(r)
+                  record.delete("log")
+                rescue JSON::ParserError
+                end
+              end
               record["severity"] = severity(record["level"] || 0)
               record["host"]     = record.delete("hostname")
               record["message"]  = record.delete("msg")
@@ -52,7 +63,7 @@ module Fluent
       end
 
       def version
-        return "0.0.4"
+        return "0.0.5"
       end
     end
   end

data/test/plugin/test_parser_bunyan.rb

@@ -81,7 +81,7 @@ class BunyanParserTest < Test::Unit::TestCase
     end
   end
 
-    test "can parse entry from Kubernetes" do
+    test "can parse entry from containerd" do
       driver = create_driver(CONFIG)
       text = '2020-03-10T07:08:41.710251038+09:00 stdout F {"hostname":"helloworld-go-helloworld-5649dfd7bd-k8954","level":30,"msg":"The message","name":"helloworld","pid":1,"scope":"main","tid":1,"time":"2020-03-10T07:08:41Z","topic":"main","v":0}'
       expected_time   = Time.utc(2020, 3, 10, 7, 8, 41).to_i
@@ -102,6 +102,29 @@ class BunyanParserTest < Test::Unit::TestCase
       end
     end
 
+    test "can parse entry from Docker for Mac/Windows" do
+      driver = create_driver(CONFIG)
+      text = '{"log":"{\"hostname\":\"helloworld-859745b47d-5dlbn\",\"level\":30,\"msg\":\"The message\",\"name\":\"helloworld\",\"pid\":1,\"remote\":\"192.168.65.3:42018\",\"scope\":\"main\",\"tid\":14,\"time\":\"2020-03-24T08:29:02Z\",\"topic\":\"main\",\"v\":0}\n","stream":"stdout","time":"2020-03-24T08:29:02.3995324Z"}'
+      expected_time   = Time.utc(2020, 3, 24, 8, 29, 2).to_i
+      expected_record = {
+        "host"     => "helloworld-859745b47d-5dlbn",
+        "name"     => "helloworld",
+        "severity" => "info",
+        "level"    => 30,
+        "message"  => "The message",
+        "remote"   => "192.168.65.3:42018",
+        "topic"    => "main",
+        "scope"    => "main",
+        "stream"   => "stdout",
+        "pid"      => 1,
+        "tid"      => 14,
+      }
+      driver.instance.parse(text) do |time, record|
+        assert_equal(expected_record, record)
+        assert_equal(expected_time,   time)
+      end
+    end
+
   private
 
   def create_driver(conf = CONFIG)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-bunyan
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gildas Cherruel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler