fluent-plugin-docker_metadata_filter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3a181437b2dba81ddb5695afa2ff08a398fa4d
-  data.tar.gz: 200420bd81fde33e9db8d065c3d311ad1d08c366
+  metadata.gz: f4313ff1a006014c62015b0835fcae4a3636751d
+  data.tar.gz: c40338dfb55a05a833bab9b044dd62966dd0e09a
 SHA512:
-  metadata.gz: 48a43e9af6ea3d21bb99b4916f579da1a816c3d4f36f4be713b37dc0b4ca50c0877ae25bf2231914e520d9bd75e38d970768ffb39dc511a50cf31813c3d9ce24
-  data.tar.gz: f13a36c14e7963b0372a47846b7e97f72528d6954c11a51af9f7c2b87781c69b367443beb8aee7d17e3be7d304fbdb3d67e30f381967e250e5418d8cb3f4fc45
+  metadata.gz: 2599b0a32d9c29af46c6eb7dc4789f8503f89b0c6017a154210a72436f0f19db389fb8bb0a7c35a00a94daea82bf35c56ab4e8fbe8900c9b3ecccaeccad77c0a
+  data.tar.gz: 2f715d6b355e983af653ccf8857ecb3304e6ca6458d3bc0ea79c7c25c3acb75e552fb796ba54230728a77c636443c7e99734b17adeff1dbeb0e8ec3e2ae39575

data/Rakefile

@@ -13,8 +13,8 @@ Rake::TestTask.new(:base_test) do |t|
   #  $ bundle exec rake base_test TEST=test/test_*.rb
   t.libs << "test"
   t.test_files = Dir["test/**/test_*.rb"].sort
-  t.verbose = true
-  #t.warning = true
+  #t.verbose = true
+  t.warning = false
 end
 
 desc "Add copyright headers"

data/fluent-plugin-docker_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-docker_metadata_filter"
-  gem.version       = "0.1.1"
+  gem.version       = "0.1.2"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Docker metadata}

data/lib/fluent/plugin/filter_docker_metadata.rb

@@ -54,19 +54,19 @@ module Fluent
       container_id = tag.match(@container_id_regexp_compiled)
       if container_id && container_id[0]
         container_id = container_id[0]
-        metadata = @cache.getset(container_id[0]){DockerMetadataFilter.get_metadata(container_id)}
+        metadata = @cache.getset(container_id){DockerMetadataFilter.get_metadata(container_id)}
 
         if metadata
           new_es = MultiEventStream.new
 
           es.each {|time, record|
-            record[:docker] = {
-              :id => metadata['id'],
-              :name => metadata['Name'],
-              :container_hostname => metadata['Config']['Hostname'],
-              :image => metadata['Config']['Image'],
-              :image_id => metadata['Image'],
-              :labels => metadata['Config']['Labels']
+            record['docker'] = {
+              'id' => metadata['id'],
+              'name' => metadata['Name'],
+              'container_hostname' => metadata['Config']['Hostname'],
+              'image' => metadata['Config']['Image'],
+              'image_id' => metadata['Image'],
+              'labels' => metadata['Config']['Labels']
             }
             new_es.add(time, record)
           }

data/test/helper.rb

@@ -19,7 +19,7 @@
 #
 require "codeclimate-test-reporter"
 SimpleCov.start do
-  formatter SimpleCov::Formatter::MultiFormatter[
+  formatter SimpleCov::Formatter::MultiFormatter.new [
     SimpleCov::Formatter::HTMLFormatter,
     CodeClimate::TestReporter::Formatter
   ]

data/test/plugin/test_filter_docker_metadata.rb

@@ -77,11 +77,11 @@ class DockerMetadataFilterTest < Test::Unit::TestCase
       VCR.use_cassette('docker_metadata') do
         es = emit('', messages)
         assert_equal(4, es.instance_variable_get(:@record_array).size)
-        assert_equal('df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115', es.instance_variable_get(:@record_array)[0][:docker][:id])
-        assert_equal('/k8s_fabric8-console-container.efbd6e64_fabric8-console-controller-9knhj_default_8ae2f621-f360-11e4-8d12-54ee7527188d_7ec9aa3e', es.instance_variable_get(:@record_array)[0][:docker][:name])
-        assert_equal('fabric8-console-controller-9knhj', es.instance_variable_get(:@record_array)[0][:docker][:container_hostname])
-        assert_equal('b2bd1a24a68356b2f30128e6e28e672c1ef92df0d9ec01ec0c7faea5d77d2303', es.instance_variable_get(:@record_array)[0][:docker][:image_id])
-        assert_equal('fabric8/hawtio-kubernetes:latest', es.instance_variable_get(:@record_array)[0][:docker][:image])
+        assert_equal('df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115', es.instance_variable_get(:@record_array)[0]['docker']['id'])
+        assert_equal('/k8s_fabric8-console-container.efbd6e64_fabric8-console-controller-9knhj_default_8ae2f621-f360-11e4-8d12-54ee7527188d_7ec9aa3e', es.instance_variable_get(:@record_array)[0]['docker']['name'])
+        assert_equal('fabric8-console-controller-9knhj', es.instance_variable_get(:@record_array)[0]['docker']['container_hostname'])
+        assert_equal('b2bd1a24a68356b2f30128e6e28e672c1ef92df0d9ec01ec0c7faea5d77d2303', es.instance_variable_get(:@record_array)[0]['docker']['image_id'])
+        assert_equal('fabric8/hawtio-kubernetes:latest', es.instance_variable_get(:@record_array)[0]['docker']['image'])
       end
     end
 
@@ -89,7 +89,7 @@ class DockerMetadataFilterTest < Test::Unit::TestCase
       VCR.use_cassette('nonexistent_docker_metadata') do
         es = emit('', messages, '1111111111111111111111111111111111111111111111111111111111111111')
         assert_equal(4, es.instance_variable_get(:@record_array).size)
-        assert_nil(es.instance_variable_get(:@record_array)[0][:docker])
+        assert_nil(es.instance_variable_get(:@record_array)[0]['docker'])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-docker_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Filter plugin to add Docker metadata