fluent-plugin-kubernetes_metadata_filter 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9531290b256b8db5aae3a5233b05f8dd3230cca4
-  data.tar.gz: cd238d8e01fe68d51f48a2a2aac54f19e85b1f74
+  metadata.gz: d416c5f8475c4e31bddd005256a2851e78a74e38
+  data.tar.gz: 7809e9ab94d1245534d3b02af1ed11b456cfb8e8
 SHA512:
-  metadata.gz: 0a20cabfd3a1d95c891ff817a619f43573913d3bb7344fe4e5a1cca86779a5a621c15befdeaaf1650b7fcab480db0d0c6f4933c8d1bae730500931a367e879ca
-  data.tar.gz: 6197d666bb010d53e1f26e6af20e8f6575e4970e8379e022e0b5f73fcd2985ab770ff847875998b5bb48808f8510c4e6b9b1bfcd80bded4bb0ec96a20a5b6381
+  metadata.gz: c5df22798cf63a8118dac365e1d3617192e9bbe1d5420425f4ece9948c52abc5242283b1b50c165a3ed33b6571540e05ab9a84b939ab5613a5026cf2c518ad8a
+  data.tar.gz: 4b8868d31d5395bb41a3109285857282cce6b98b5b5e9fc27a5822e8e5cbd02204f78061cc7532f2d9294d521687ab85444029cf7cffa1d666e98ccd5684a6a2

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "0.18.0"
+  gem.version       = "0.19.0"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -303,6 +303,23 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       assert_equal(msg.merge(json_log), es.instance_variable_get(:@record_array)[0])
     end
 
+    test 'merges json log data with message field' do
+      json_log = {
+        'timeMillis' => 1459853347608,
+        'thread' => 'main',
+        'level' => 'INFO',
+        'loggerName' => 'org.apache.camel.spring.SpringCamelContext',
+        'message' => 'Total 1 routes, of which 1 is started.',
+        'endOfBatch' => false,
+        'loggerFqcn' => 'org.apache.logging.slf4j.Log4jLogger'
+      }
+      msg = {
+        'log' => "#{json_log.to_json}"
+      }
+      es = emit_with_tag('non-kubernetes', msg, '')
+      assert_equal(msg.merge(json_log), es.instance_variable_get(:@record_array)[0])
+    end
+
     test 'with kubernetes dotted labels, de_dot enabled' do
       VCR.use_cassette('kubernetes_docker_metadata_dotted_labels') do
         es = emit()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd