fluent-plugin-kubernetes_metadata_filter 0.12.0 → 0.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9a693d1d4eda7b6f2243e7be4852cb0d158a5aba
4
- data.tar.gz: d9d6d6ef27bf420eb20f6abbfcb254452b39b983
3
+ metadata.gz: 07eed1fc31d6635e4b2ce9adc7416663bca6dc15
4
+ data.tar.gz: 8fab94bc4ae9613e2619a612587cf5c77ea0fee7
5
5
  SHA512:
6
- metadata.gz: ca3e4278a6394318a7a0cb840da1820502d5eeca95339d4968ad25fb19c55b78c4bdbee16b6854293740af8a2ac01c9777546452750681e23d25df0caee7d0f6
7
- data.tar.gz: 1e6038a0ff64a556ecc2dfac8c693ec4ec2cd1040d905414bb3c1dc2b11ba36a8cdd1a1c28f2843224815e7f9d5d6cf9459076f32c9d158f3a8babdf2f557ff2
6
+ metadata.gz: e82a0f694e1e467730a8544a3ceff8c3b17725cbcc38e83a4f66aa63026d98bca7ab142cba0a67c55bd0e74ff1fdce20ea313c62fdc327311986f0d347a44d0c
7
+ data.tar.gz: 87410c68eb75161b16532841530dd31b5ba1de76af6913b49265043e1915a5fd4f6ba4b6bb161c77104c86acd1c7ad7f28c13e118f89e5373f9eaa28efac5f56
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |gem|
6
6
  gem.name = "fluent-plugin-kubernetes_metadata_filter"
7
- gem.version = "0.12.0"
7
+ gem.version = "0.13.0"
8
8
  gem.authors = ["Jimmi Dyson"]
9
9
  gem.email = ["jimmidyson@gmail.com"]
10
10
  gem.description = %q{Filter plugin to add Kubernetes metadata}
@@ -169,11 +169,7 @@ module Fluent
169
169
  log = record['log'].strip
170
170
  if log[0].eql?('{') && log[-1].eql?('}')
171
171
  begin
172
- parsed_log = JSON.parse(log)
173
- record = record.merge(parsed_log)
174
- unless parsed_log.has_key?('log')
175
- record.delete('log')
176
- end
172
+ record = JSON.parse(log).merge(record)
177
173
  rescue JSON::ParserError
178
174
  end
179
175
  end
@@ -248,7 +248,7 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
248
248
  'log' => "#{json_log.to_json}"
249
249
  }
250
250
  es = emit_with_tag('non-kubernetes', msg, '')
251
- assert_equal(json_log, es.instance_variable_get(:@record_array)[0])
251
+ assert_equal(msg.merge(json_log), es.instance_variable_get(:@record_array)[0])
252
252
  end
253
253
  end
254
254
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-kubernetes_metadata_filter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.0
4
+ version: 0.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jimmi Dyson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-23 00:00:00.000000000 Z
11
+ date: 2015-10-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd