fluent-plugin-cadvisor 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc27dc7b6eacb7f6a6ec2b6d1be24e779f19e338
-  data.tar.gz: 45e9f5aed730fee19b6657ee4ee8e7d8692e4a8d
+  metadata.gz: ab3747c4c91314d4764aea6543e15c4039d10233
+  data.tar.gz: 2a30d6a9420f4d271aca5a36266b68274f12b95f
 SHA512:
-  metadata.gz: a9fb706b609eeb8b40390a3a3044cba45338f53dcfc37538af3c579ab688c36db5dc4632116cf74705eede4ba94d18571a9b8a8a2c30e3e85b3d81f10d3b0b10
-  data.tar.gz: e5c8eef8885dc44886d744bb763bb1d4007ba58583054bb1420f8dec6bdb46a7c2d949d4ac41f99bf9e90338a2fc0376a4704bef1816135cd56b5add5794aadf
+  metadata.gz: a23c22af27aaece96da264df40248712a9920519fba758326ad025337028717138767b0ad3464e8009425bdb6643d634e01ea4570f2b77e25ad3af5478c6e925
+  data.tar.gz: 38e7fba985453a847332ef4c4b764023a363640515269e2a49a0f9b2cc7007600756b7ff193085ee8d836d30a5ede626515d456243c3dd7080d66c0170758ceb

data/fluent-plugin-cadvisor.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-cadvisor"
-  spec.version       = "0.2.5"
+  spec.version       = "0.3.0"
   spec.authors       = ["Woorank"]
   spec.email         = ["dev@woorank.com"]
   spec.summary       = "cadvisor input plugin for Fluent event collector"
@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'rest-client', '>= 0'
+  spec.add_runtime_dependency 'docker-api', '>= 0'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/fluent/plugin/in_cadvisor.rb

@@ -1,6 +1,7 @@
 require 'rest-client'
 require 'digest/sha1'
 require 'time'
+require 'docker'
 
 class CadvisorInput < Fluent::Input
   class TimerWatcher < Coolio::TimerWatcher
@@ -25,10 +26,13 @@ class CadvisorInput < Fluent::Input
   config_param :api_version, :string, :default => '1.1'
   config_param :stats_interval, :time, :default => 60 # every minute
   config_param :tag_prefix, :string, :default => "metric"
+  config_param :docker_url, :string,  :default => 'unix:///var/run/docker.sock'
 
   def initialize
     super
     require 'socket'
+
+    Docker.url = @docker_url
     @hostname = Socket.gethostname
     @dict     = {}
   end
@@ -69,39 +73,19 @@ class CadvisorInput < Fluent::Input
 
   # Metrics collection methods
   def get_metrics
-    list_container_ids.each do |obj|
+    Docker::Container.all.each do |obj|
       emit_container_info(obj)
     end
   end
 
-  def list_container_ids
-    socket_path = "/var/run/docker.sock"
-    if File.exists?(socket_path)
-      socket = Socket.unix(socket_path)
-      socket.puts("GET /containers/json HTTP/1.0\n\r")
-
-      res = socket.readlines
-      socket.close
-
-      # Find body position
-      idx = -1
-      res.to_a.each_with_index do | stats, index |
-        if stats[0] == '['
-          idx = index
-          break;
-        end
-      end
+  def emit_container_info(obj)
+    container_json = obj.json
+    config = container_json['Config']
 
-      #Remove HTTP Headers and parse the body
-      jsn = JSON.parse(res.to_a[idx..-1].join)
-      jsn.collect { |obj| {:id => obj['Id'], :name => obj['Image']} }
-    else
-      []
-    end
-  end
+    id   = container_json['Id']
+    name = container_json['Image']
+    env  = config['Hostname'].split('--')[2] || '' # app--version--env
 
-  def emit_container_info(obj)
-    id = obj[:id]
     response = RestClient.get(@cadvisorEP + "/containers/docker/" + id)
     res = JSON.parse(response.body)
 
@@ -133,9 +117,10 @@ class CadvisorInput < Fluent::Input
       interval_in_ns = get_interval(stats['timestamp'], prev['timestamp'])
 
       record = {
-        'id'                 => Digest::SHA1.hexdigest("#{obj[:name]}#{id}#{timestamp.to_s}"),
+        'id'                 => Digest::SHA1.hexdigest("#{name}#{id}#{timestamp.to_s}"),
         'container_id'       => id,
-        'image'              => obj[:name],
+        'image'              => name,
+        'environment'        => env,
         'memory_current'     => stats['memory']['usage'],
         'memory_limit'       => memory_limit,
         'cpu_usage'          => raw_usage,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cadvisor
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Woorank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -24,6 +24,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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement