fluent-plugin-bunyan 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1029080cec5f0f3c41daf53690064ede240203a0c4f8aef2f2efe3a6e3f494ab
-  data.tar.gz: f08f8da72daebe1551b142b5518dc61236ee805b1b297b76d662ead4a844cd8a
+  metadata.gz: 9c7ca077c27fc89eada5a3b8854ae9ac6b16a26503d73fa5690f4b8ed423d77c
+  data.tar.gz: 35fe59d48c1c8dabe0c22900ff203e46884fb0b21125e7a8799399b70f3a3fe8
 SHA512:
-  metadata.gz: 6da8a9d3af22e4fe0356d8bc2245970e9484d0d593cf005ea905d1cd9542dc33d2529c38c812733fd50fb7f8a0a0fba155a922e65e2cfb26d7142107595aafb4
-  data.tar.gz: bda8cdada387de5bf07b4eb1d74c6aaf6aaf3447c3080a0dc84ad1592a3f517a76917b7b63c65fe117371fd1a4160d2c72f50078c0492ab9244bbba198de8ff0
+  metadata.gz: e4854c127c3a0903daa6b604f2b347c9bea23f9fe202fad1c10779b340efc177459cb34552f35a50c713f36241fd9e2204cd64bd7b55dcc75dd744cd5f876a86
+  data.tar.gz: 44b4796655c0985988e9683a71ce0a849c9cb4d45ad075267ff790f542bb7022c1c41b28690e47de42ac5c703a2a05b6dd6be69cb86102ee7e130c1d05bf4353

data/CHANGELOG.md

@@ -3,7 +3,7 @@
 This file contains changes throughout the life of this project.
 
 ### Development
-[Full Changelog](https://github.com/gildas/fluent-plugin-bunyan/compare/v0.0.2...dev)
+[Full Changelog](https://github.com/gildas/fluent-plugin-bunyan/compare/v0.0.4...dev)
 
 New Features:
 * None Yet
@@ -11,6 +11,23 @@ New Features:
 Bug Fixes:  
 * None Yet
 
+### 0.0.4 / 2020-03-17
+[Full Changelog](https://github.com/gildas/fluent-plugin-bunyan/compare/v0.0.3...v0.0.4)
+
+Bug Fixes:
+* JSON logs were not extracted properly when coming from Kubernetes
+
+### 0.0.3 / 2020-03-15
+[Full Changelog](https://github.com/gildas/fluent-plugin-bunyan/compare/v0.0.2...v0.0.3)
+
+New Features:
+* Not exactly a feature, but tests go through Azure Pipeline
+
+Bug Fixes:
+* Removed the requirement of rake version as per gem build warning
+* The Fluent parser was not "required" properly besides tests passing
+* License was still Apache on the README file
+
 ### 0.0.2 / 2020-03-10
 [Full Changelog](https://github.com/gildas/fluent-plugin-bunyan/compare/v0.0.1...v0.0.2)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-bunyan (0.0.2)
+    fluent-plugin-bunyan (0.0.4)
       fluentd (>= 0.14.10, < 2)
 
 GEM
@@ -22,7 +22,6 @@ GEM
     http_parser.rb (0.6.0)
     msgpack (1.3.3)
     power_assert (0.2.7)
-    rake (13.0.1)
     serverengine (2.2.1)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
@@ -41,7 +40,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.14)
   fluent-plugin-bunyan!
-  rake (>= 12.3.3)
   test-unit (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -34,7 +34,7 @@ Simply add the parser to the [Fluentd](https://fluentd.org/) configuration file,
 To run the unit tests, make sure you have the [Fluentd](https://fluentd.org/) gem installed and run:
 
 ```console
-bundle exec rake test
+rake test
 ```
 
 ## Copyright

data/azure-pipelines.yml

@@ -20,5 +20,5 @@ steps:
     bundle install --retry=3 --jobs=4
   displayName: 'bundle install'
 
-- script: bundle exec rake
-  displayName: 'bundle exec rake'
+- script: rake test
+  displayName: 'run tests'

data/fluent-plugin-bunyan.gemspec

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

data/lib/fluent/plugin/parser_bunyan.rb

@@ -26,13 +26,19 @@ module Fluent
       end
 
       def parse(text)
-        super(text) do |time, record|
-          record["severity"] = severity(record["level"] || 0)
-          record["host"]     = record.delete("hostname")
-          record["message"]  = record.delete("msg")
+        # Example of a log line 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}
+        if text =~ /[^{]*({.*)/
+          super(text.sub(/[^{]*({.*)/, '\1')) do |time, record|
+            if record then
+              record["severity"] = severity(record["level"] || 0)
+              record["host"]     = record.delete("hostname")
+              record["message"]  = record.delete("msg")
 
-          record.delete("v")
-          yield time, record
+              record.delete("v")
+            end
+            yield time, record
+          end
         end
       end
 
@@ -46,7 +52,7 @@ module Fluent
       end
 
       def version
-        return "0.0.3"
+        return "0.0.4"
       end
     end
   end

data/test/plugin/test_parser_bunyan.rb

@@ -81,6 +81,27 @@ class BunyanParserTest < Test::Unit::TestCase
     end
   end
 
+    test "can parse entry from Kubernetes" 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
+      expected_record = {
+        "host"     => "helloworld-go-helloworld-5649dfd7bd-k8954",
+        "name"     => "helloworld",
+        "severity" => "info",
+        "level"    => 30,
+        "message"  => "The message",
+        "topic"    => "main",
+        "scope"    => "main",
+        "pid"      => 1,
+        "tid"      => 1,
+      }
+      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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gildas Cherruel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler