logstash-filter-docker_container 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1622d74b418ee109102656edde38f595b14fa112
-  data.tar.gz: 784f7e6c23f0b874b3207d089f85286b7a7fe6a9
+  metadata.gz: b2cc55c3d6f9e8078a710db5fbd901b297ddd237
+  data.tar.gz: 949d74ea2a51e4f91cd8cf304782ad233c3f9244
 SHA512:
-  metadata.gz: 043d0a774f01e72fb9e810b35a09ec741c9ae0ad51f994630ac3dd0008abf40acee9e5ea5e01aa90b759491747c91c1a70ad860b21acd3a5c9252c521cecbc57
-  data.tar.gz: a083587689682b383597c4d8c5b648256940a9894402b6ce1188796840a8ad8747a69ddc42b5592ccfa6c298d0df8d994ea877270355bf5efbeb3ebf124a5c65
+  metadata.gz: 3dde8958c591688700178a63c40ae05496f1bd549e14416be6f975ee1953198de5ef5c6eaf1e88cb8546ef2b6f189aeb10ac371fdc9ea1a76c62d8c665b8cd74
+  data.tar.gz: 4422d701531969609f71dfa0453250bebc6e31304f3ec3ae0fa2cb0a6618576e7b8e80935ede591e324579c4f376d9c63e082964ab42ccdea39064566d1c2f43

data/lib/logstash/filters/docker_container.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'logstash/filters/base'
 require 'logstash/namespace'
-require 'lib/logstash/filters/docker_container/docker_container_inspector'
+require 'logstash/filters/docker_container/docker_container_inspector'
 require 'json'
 
 class LogStash::Filters::DockerContainer < LogStash::Filters::Base
@@ -18,6 +18,7 @@ class LogStash::Filters::DockerContainer < LogStash::Filters::Base
   def register
     # Add instance variables
     @inspector = LogStash::Filters::DockerContainerSupport::DockerContainerInspector.new(@docker_client, @client_options)
+    @cached = Hash.new
   end # def register
 
   public
@@ -32,13 +33,17 @@ class LogStash::Filters::DockerContainer < LogStash::Filters::Base
   end
 
   def resolve_from(container_id)
+    if @cached.has_key?(container_id)
+      return @cached[container_id]
+    end
+
     blob = @inspector.inspect container_id
     details = JSON.parse(blob)
 
     return nil if details.empty?
 
     detail = details.first
-    detail['Name']
+    @cached[container_id] = detail['Name']
 
   end # def filter
 end

data/logstash-filter-docker_container.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-docker_container'
-  s.version         = '0.1.0'
+  s.version = '0.1.1'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Resolves Docker container IDs into the container's name."
   s.description = "With Docker's syslog log-driver the log entries contain just container ID, but seeing the name is even better"

data/spec/filters/docker_container_spec.rb

@@ -9,7 +9,7 @@ describe LogStash::Filters::DockerContainer do
     allow(LogStash::Filters::DockerContainerSupport::DockerContainerInspector).to receive(:new).and_return(inspector)
   end
 
-  describe "typical case" do
+  describe "typical case and cached" do
     let(:config) do <<-CONFIG
       filter {
         docker_container {
@@ -21,14 +21,18 @@ describe LogStash::Filters::DockerContainer do
 
     before do
       content = File.new(File.join(File.dirname(__FILE__),'container_logstash.json')).read()
-      expect(inspector).to receive(:inspect)
+      # Due to caching of the Docker findings, the inspector should only be consulted once
+      # since the sample includes the same container ID both times
+      expect(inspector).to receive(:inspect).once
                                .with('bd30193a3b9d')
                                .and_return(content)
     end
 
-    sample('container_id' => 'bd30193a3b9d') do
-      expect(subject).to include('container_name')
-      expect(subject['container_name']).to eq('/logstash')
+    sample([{'seq' => 1, 'container_id' => 'bd30193a3b9d'}, {'seq' => 2, 'container_id' => 'bd30193a3b9d'}]) do
+      subject.each do |e|
+        expect(e).to include('container_name')
+        expect(e['container_name']).to eq('/logstash')
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-docker_container
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Geoff Bourne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core