fluent-plugin-kubernetes 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c522ac244cb884a41b77a6042d25f223a52a4448
-  data.tar.gz: 6a8bffaabeed107e17a5f7ad4f04d3fb04823e83
+  metadata.gz: e60aff3afc155348f6340256f4acd8d47786ea13
+  data.tar.gz: 5bbdcb6a7925a715069f7b9cfbc1893cc0ec4909
 SHA512:
-  metadata.gz: a3edc748acc0b6c9cb8542bdf849f20ffbcbeed7a5e0ed3c045742e12268bc2f9d42b892e5eca11ef38d470d77b2910c2009a94ca42a89260f80e15b29aba89b
-  data.tar.gz: d881fd0b70f7d9b2b91ac27c0bc0b90a06b221b546ebcb0fcbd294f58b099f20e53d64c23aa8d6f3f546ec0dca066bc2a8e5e03bf14408ce7fa1482894cccfe3
+  metadata.gz: 8b6eb7bf52dd7bf9d910b0687ddd4f1df291b29d50c7a76c22dc46905c2581f7adda7e449c9c745f30e86139e33d9dd9d031e86f21ff9bd7ba5b98c836faf0ef
+  data.tar.gz: 73293093eab47d7e2ed2fca5f97ff597f1fb6fefdd44ba6ad7675c96e28f1f80990d3239e04db4297f0540900e5460cc04f9520b4975332ba4924e1831aaeedc

data/README.md

@@ -1,10 +1,5 @@
 # fluent-plugin-kubernetes, a plugin for [Fluentd](http://fluentd.org) 
 
-## Requirements
-
-Requires [fluent-plugin-docker-format](https://github.com/bwalex/fluent-plugin-docker-format)
-plugin.
-
 ## Installation
 
     gem install fluent-plugin-kubernetes
@@ -18,18 +13,15 @@ plugin.
   time_format %Y-%m-%dT%H:%M:%S
   tag docker.*
   format json
+  read_from_head true
 </source>
 
 <match docker.var.lib.docker.containers.*.*.log>
-  type docker_format
+  type kubernetes
   container_id ${tag_parts[5]}
   tag docker.${name}
 </match>
 
-<match docker.**>
-  type kubernetes
-</match>
-
 <match kubernetes>
   type stdout
 </match>

data/fluent-plugin-kubernetes.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-kubernetes"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["Jimmi Dyson"]
   spec.email         = ["jimmidyson@gmail.com"]
   spec.description   = %q{Output filter plugin to add Kubernetes metadata}
@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 4.0"
   spec.add_runtime_dependency "fluentd"
+  spec.add_runtime_dependency "docker-api"
 end

data/lib/fluent/plugin/out_kubernetes.rb

@@ -3,7 +3,9 @@ require 'open3'
 class Fluent::KubernetesOutput < Fluent::Output
   Fluent::Plugin.register_output('kubernetes', self)
 
-  K8S_CONTAINER_NAME_REGEX = '^[^_]+_([^\.]+)\.[^_]+_([^\.]+)\.([^\.]+)'
+  config_param :container_id, :string
+  config_param :tag, :string
+  config_param :kubernetes_pod_regex, :string, default: '^[^_]+_([^\.]+)\.[^_]+_([^\.]+)\.([^\.]+)'
 
   def initialize
     super
@@ -11,26 +13,46 @@ class Fluent::KubernetesOutput < Fluent::Output
 
   def configure(conf)
     super
+
+    require 'docker'
   end
 
   def emit(tag, es, chain)
     es.each do |time,record|
-      Fluent::Engine.emit('kubernetes', time, enrich_record(record))
+      Fluent::Engine.emit('kubernetes', time, enrich_record(tag, record))
     end
 
     chain.next
   end
 
-  def enrich_record(record)
-    if record.has_key? "container_name"
-      regex = Regexp.new(K8S_CONTAINER_NAME_REGEX)
-      match = record["container_name"].match(regex)
-      if match
-        pod_container_name, pod_name, pod_namespace =
-          match.captures
-        record["pod_namespace"] = pod_namespace
-        record["pod"] = pod_name
-        record["pod_container"] = pod_container_name
+  private
+
+  def interpolate(tag, str)
+    tag_parts = tag.split('.')
+
+    str.gsub(/\$\{tag_parts\[(\d+)\]\}/) { |m| tag_parts[$1.to_i] }
+  end
+
+  def enrich_record(tag, record)
+    if @container_id
+      id = interpolate(tag, @container_id)
+      record['container_id'] = id
+      puts id
+      container = Docker::Container.get(id)
+      if container
+        container_name = container.json['Name']
+        if container_name
+          record["container_name"] = container_name
+          regex = Regexp.new(@kubernetes_pod_regex)
+          match = container_name.match(regex)
+          if match
+            pod_container_name, pod_name, pod_namespace =
+              match.captures
+            record["pod_namespace"] = pod_namespace
+            record["pod"] = pod_name
+            record["pod_container"] = pod_container_name
+          end
+        end
       end
     end
     record

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Output filter plugin to add Kubernetes metadata
 email:
 - jimmidyson@gmail.com