fluent-plugin-docker-format 0.1.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b01883397bc25c175beeb51f0dee5eeb0418eb83
-  data.tar.gz: b0a4bc332d9c179b789e1392d30d9eee0a21d31c
+  metadata.gz: be57ce64c465076f7b7d55257907427b1506deb0
+  data.tar.gz: 68dafbc546852c7d49d599f058c31904646139a9
 SHA512:
-  metadata.gz: c235243284c7146c68712b0be4f7f655903fea69113e4594818671c81835b76be9e0e4679b8b7b1a48ec7b93074f333ec706673d1e610aff63c1fa0700814b16
-  data.tar.gz: 11915f2fd54669bf12cdab326b891076971bc404fe0abfcaadea1db0a404d22b756dd1c400a6a7d25af780331bec2d34e888df35fd6b15dc52d6c5f4b095b612
+  metadata.gz: 2089eafa6b6ebbfc6b89a24eaeb833da5c42a5e6588924642006c81eb69bf45952e483d0ac410466354933f30613b8473c4cb575edfcffb5536b93320c930ee4
+  data.tar.gz: b2ed8d1a59c9748c010719e76ce45f42f266f4a779c9fa06e098620141bb91395589188887c9d3bd03b3dbde9248d8f3f9bccb40580fce46f6133bbf521c86d5

data/README.md

@@ -48,7 +48,7 @@ A full example:
 <match docker.var.lib.docker.containers.*.*.log>
   type docker_format
   container_id ${tag_parts[5]}
-  tag docker.all
+  tag docker.${name}
 </match>
 ```
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.3

data/lib/fluent/plugin/out_docker_format.rb

@@ -14,7 +14,7 @@ module Fluent
 
     def emit(tag, es, chain)
       es.each do |time,record|
-        Engine.emit(@tag, time, format_record(tag, record))
+        Engine.emit(interpolate_tag(tag), time, format_record(tag, record))
       end
 
       chain.next
@@ -28,12 +28,20 @@ module Fluent
       str.gsub(/\$\{tag_parts\[(\d+)\]\}/) { |m| tag_parts[$1.to_i] }
     end
 
+    def interpolate_tag(tag)
+      id = interpolate(tag, @container_id)
+      name = get_name(id)
+      name = name[1..-1] if name
+
+      @tag.gsub(/\$\{name\}/, name || id)
+    end
+
     def get_name_from_cfg(id)
       begin
         docker_cfg = JSON.parse(File.read("#{@docker_containers_path}/#{id}/config.json"))
         container_name = docker_cfg['Name']
       rescue
-        container_name = "<unknown>"
+        container_name = nil
       end
       container_name
     end
@@ -46,7 +54,7 @@ module Fluent
     def format_record(tag, record)
       id = interpolate(tag, @container_id)
       record['container_id'] = id
-      record['container_name'] = get_name(id)
+      record['container_name'] = get_name(id) || "<unknown>"
       record
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-docker-format
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Alex Hornung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler