fluent-plugin-docker-inspect 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e464b4b66f5ea18153ea874c33f13efbacf886dc
-  data.tar.gz: db245ffbef8137ad09f37e3e88f6d5abec9a829d
+  metadata.gz: 594dfb450c0523dea0239c2e45a266990805f166
+  data.tar.gz: a8c25679540b4d60b73524b0340dc2b7a0da4d24
 SHA512:
-  metadata.gz: 92ad1084a84924eb3f43d81df0edba9bc6e06347543d8338db1b5edff31366c150dcdb8be25c6284419322ed36ab42892f1c3b71c6625cf560a7fc98ef388bfe
-  data.tar.gz: aec437c71155986107008bc2fb105dc68e9ddd7303f13b25f7eca8326321cad1b3881d2356250c8b270d8e74033b47071be82cbc5533eb55df8ea4b34147b0b8
+  metadata.gz: 3b8f897f41694ad4a0aef7a89871a7de736587bcf398b37a7cc812ecbf2d806d3d8f1af01f6666d67e560f9a40d4776ac05d49441c86f90b8816a14001fc5e95
+  data.tar.gz: 77578301ea7b698b62fdf39f667b77684ba055856707247dbd852fb0727bf4f48dc7bb19dec97c9f765da726b07c3c49c355d53cdf03551d1eb3b38f5a537e46

data/README.rst

@@ -19,24 +19,38 @@ Configuration
 
 ::
 
-  <source>
-    type docker_inspect
-    emit_interval 10
-    tag docker
-    add_addr_tag yes
-  </source>
-
+   <source>
+     type docker_inspect
+     emit_interval 30
+     tag docker.inspects
+     add_addr_tag yes
+     filter { "status": ["running"] }  # see Docker remote API
+     only_changed true
+     <keys>
+       id Id
+       created Created
+       path Path
+       status State.Status
+       ports NetworkSettings.Ports
+       ip_addr NetworkSettings.IPAddress
+       mac_addr NetworkSettings.MacAddress
+     </keys>
+   </source>
 
 emit_interval
-  emit interval by second. (default 60 sec)
+  Emit interval by second. (default 60 sec)
 tag
   fluentd tag.
 docker_url
-  specify docker_url if remote. ex: ``tcp://example.com:5422``. If docker runs local, no need to specify this param.
+  Specify docker_url if remote. ex: ``tcp://example.com:5422``. If docker runs local, no need to specify this param.
 add_addr_tag
-  if specify some string such as 'yes', add local host ipv4 addr. (default: nil)
+  If specify some string such as 'yes', add local host ipv4 addr. (default: nil).
+filter
+  Set fileter about container. See Docker remote API to specify params.
 only_changed
-  if yes, only emit when docker inspect is changed.
+  If true, only emit when docker inspect is changed. (default is true)
+keys
+  If set, output values containes only specified keys and path(period separated value). Default is output all values as one JSON.
 
 License
 ----------

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/fluent/plugin/in_docker_inspect.rb

@@ -1,3 +1,15 @@
+# convert dot-string to value in hash
+# ex: NetworkSettings.Ports -> hash[NetworkSettings][Ports]
+def dig(hash, dotted_path)
+  parts = dotted_path.split '.', 2
+  match = hash[parts[0]]
+  if !parts[1] or match.nil?
+    return match
+  else
+    return dig(match, parts[1])
+  end
+end
+
 module Fluent
   class DockerInspectInput < Input
     Fluent::Plugin.register_input('docker_inspect', self)
@@ -7,7 +19,7 @@ module Fluent
     config_param :tag, :string, :default => nil
     config_param :add_addr_tag, :string, :default => nil
     config_param :filter, :string, :default => nil
-    config_param :only_changed, :string, :default => nil
+    config_param :only_changed, :bool, :default => true
 
     unless method_defined?(:log)
       define_method(:log) { $log }
@@ -47,6 +59,16 @@ module Fluent
 
     def configure(conf)
       super
+
+      # Read configuration for keys and create a hash
+      @keys = Hash.new
+      conf.elements.select { |element| element.name == 'keys' }.each { |element|
+        element.each_pair { |key_name, path|
+          element.has_key?(key_name) # to suppress unread configuration warning
+          @keys[key_name] = path
+          @log.info "Added keys: #{key_name}=>#{@keys[key_name]}"
+        }
+      }
     end
 
     def start
@@ -87,7 +109,19 @@ module Fluent
         return
       end
       inspect.each { | i |
-        @es.add(time, i)
+        if @keys.length > 0  # keys are specfied
+          k = Hash.new
+          changed = false
+          @keys.each do |key_name, path|
+            tmp = dig(i, path)
+            next if tmp == ""
+            k[key_name] = tmp
+            changed = true  # if nothing matched, not sent
+          end
+          @es.add(time, k) if changed
+        else
+          @es.add(time, i)
+        end
       }
       router.emit_stream(tag, @es)
     end
@@ -121,6 +155,7 @@ module Fluent
       get_containers.each { |c|
         result.push c.json
       }
+      # check changed before or not
       if @only_changed && @last_inspect.to_s == result.to_s
         return []
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-docker-inspect
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - WAKAYAMA Shirou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd