fluent-plugin-ecs-filter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWM4ZTNjMDFjZTg1OTAxNDg0YjQ4MmE3ZDJiYTgyYjUyYWFkYzNlOA==
+    NjlmYzBiMzUyMGIzM2U4NWNhZTc2NjcyOGQ4ZTg4ZjUyZWYwMzUxYQ==
   data.tar.gz: !binary |-
-    YzczZjYwZjNkYjEyYjUzMDM5YzljNThmODNlMjVjOTdjMDhlYTk2ZA==
+    YTZhZmRlZjllZGU2ODg5YzkwOTU5Y2Y4MjkxNWI2NzhhY2EzNWViZg==
 SHA512:
   metadata.gz: !binary |-
-    NDhiZjVhM2NhMGQwZjljNzFhNzA3YTE2YjllYTdiYmNiZTIyMTU5MGFlY2I5
-    MjkzZjM2NTgwNDk5MWU4MTU3MTIwZDMzNTFhMzIzNDVjOGY0NDRjMjAzNGM1
-    NWQ1NzE1ZTQ1N2M0ZGIyNTlhZTM1MTdmZmYxZTBlMDAyYjVlM2U=
+    YTRkYjFkYjhjMTU0MDk3NjYyYzJlYjM5MWNkOTc2NWIyOGU4ZTQ4YjVkZmQy
+    NGU0NjcwZWQzNTY5NWNhZDU1NTRiMjExMjNjNDZhMWViY2MzZTc1NzYzZWI1
+    MTQyYWQ5NjU1YzQxOTdlZWQ1NjY5YWY4Y2JhNGQ0NWFlZjJlMjY=
   data.tar.gz: !binary |-
-    OWVhMWM3MDJiNWIzZWYzYmJkNzFmM2VlYTUxYzliNmVkYzk3MGIwM2IyMzVj
-    ZjU5ODMyY2VjMGRjMGI4N2FmYTJhMTlmMjcwOWI3OWRiNjg2ODI1ZDdhODU1
-    NmNhMjIyY2M2NDk3NzE2MmMwMzVjNTE1NTI5ZDc4YjcxYTg5ZWQ=
+    MWE1OWY4ZTBlYTZlNDE3N2Y0OGE0OWMzYWM5YmY0YjNkN2RiMWI0MjMyZDJi
+    NDdjZmJkZDU0Yjc3OWY2YWZjZWFhMmRmY2JjZWRlYWRjMGIwYzJhMTkwMzU4
+    MDQ1NTNjNTEyZTc5YjRkOGFiYmY4YTY5ZjUwODYyYWRjZThmM2Y=

data/README.md

@@ -3,7 +3,7 @@
 [![Test Coverage](https://codeclimate.com/github/joshughes/fluent-plugin-ecs-filter/badges/coverage.svg)](https://codeclimate.com/github/joshughes/fluent-plugin-ecs-filter/coverage)
 [![Gem Version](https://badge.fury.io/rb/fluent-plugin-ecs-filter.svg)](https://badge.fury.io/rb/fluent-plugin-ecs-filter)
 [![Inline docs](http://inch-ci.org/github/joshughes/fluent-plugin-ecs-filter.svg?branch=master)](http://inch-ci.org/github/joshughes/fluent-plugin-ecs-filter)
-[![Dependency Status](https://www.versioneye.com/user/projects/5658d10aaef3b5003e000000/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5658d10aaef3b5003e000000)
+[![Dependency Status](https://www.versioneye.com/user/projects/5748a0dace8d0e004505f7cd/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5748a0dace8d0e004505f7cd)
 
 Marathon, Chronos and Mesos combined can allow for teams to build a great solution for deploying and scaling containers. The issue is when you have a system like Kibana it can be hard to identify what container or task a log is coming from.
 

data/fluent-plugin-ecs-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-ecs-filter'
-  gem.version       = '0.1.0'
+  gem.version       = '0.1.1'
   gem.authors       = ['Joseph Hughes']
   gem.email         = ['jjhughes57@gmail.com']
   gem.description   = 'Filter plugin to add AWS ECS metadata'

data/lib/fluent/plugin/filter_ecs_filter.rb

@@ -24,7 +24,7 @@ module Fluent
     config_param :cache_size, :integer, default: 1000
     config_param :cache_ttl, :integer, default: 60 * 60
     config_param :container_id_attr, :string, default: 'container_id'
-
+    config_param :task_family_prepend, :string, default: nil
     config_param :merge_json_log, :bool, default: true
 
     # Get the configuration for the plugin
@@ -39,7 +39,6 @@ module Fluent
       @cache_ttl = :none if @cache_ttl < 0
 
       @cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
-
     end
 
     # Gets the log event stream and moifies it. This is where the plugin hooks
@@ -98,6 +97,7 @@ module Fluent
       if container
         labels = container.json['Config']['Labels']
         task_data['task_family']  = labels['com.amazonaws.ecs.task-definition-family']
+        task_data['task_family'].prepend(@task_family_prepend) if @task_family_prepend
         task_data['task_version'] = labels['com.amazonaws.ecs.task-definition-version']
         task_data['task_id']      = labels['com.amazonaws.ecs.task-arn'].split('/').last
       end

data/test/plugin/test_mesosphere.rb

@@ -25,6 +25,9 @@ class ECSFilterTest < Test::Unit::TestCase
     get_container_id_tag true
     container_id_attr container_id
   ]
+  CONFIG4 = %[
+    task_family_prepend foo-
+  ]
 
   def create_driver(conf = CONFIG, tag = 'test')
     Fluent::Test::FilterTestDriver.new(Fluent::ECSFilter, tag).configure(conf)
@@ -60,6 +63,20 @@ class ECSFilterTest < Test::Unit::TestCase
     assert_equal task_id, log_entry['task_id']
   end
 
+  def test_task_family_prepend
+    setup_ecs_container('foobar123', 'ecs')
+
+    d1 = create_driver(CONFIG4, 'docker.foobar123')
+    d1.run do
+      d1.filter('log' => 'Hello World 1')
+    end
+    filtered = d1.filtered_as_array
+
+    log_entry = filtered[0][2]
+
+    assert_equal 'foo-unifi-video', log_entry['task_family']
+  end
+
   def test_container_cache
     setup_ecs_container('foobar123', 'ecs')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ecs-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joseph Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd