fluent-plugin-mesosphere-filter 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a0a835dd510a8ba26fb44a41b0f2ceac1cf9fe1
-  data.tar.gz: d156ade5790336f2928136f446f14210593c7cda
+  metadata.gz: 24d1d9b79acd0a65968939fb9eeec29ca5d19776
+  data.tar.gz: 19d866f268e7d0ccb6dd563214d8e0ed91f6fb56
 SHA512:
-  metadata.gz: b18cf6364356cc3bd67b50e889afeddaf5f59ddb3d9b02acd456f4edd6321146a47dfecf8600955efe619d41321b9f24244e3ca15a0e94276676581459b1391d
-  data.tar.gz: 6b2cbaec9c32ce58fc75f41cf8b2c8e25daa7f2ba7653141b5481b90c7f56a85b42b2e4d922e5e24cc8b2f5ba12a00143975866b46fe76185ebc95cd732ce922
+  metadata.gz: bcc0c3e95aa0814ed5fa62ec1016c75dcfd11078a95a02102579f90b5a24dca60117f1640defec263de078091c758f8b82c551a7692322944e2dfd863ac5257f
+  data.tar.gz: b96ea2cab68e0a5d2d70294ac7020381150508d67adfd736fcde5c77c284b4a15dc7887667a670f8a370157924467c12f2fe7627296fa6fd8d5c04738aead51b

data/fluent-plugin-mesosphere-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-mesosphere-filter'
-  gem.version       = '0.1.12'
+  gem.version       = '0.2.0'
   gem.authors       = ['Joseph Hughes']
   gem.email         = ['jjhughes57@gmail.com']
   gem.description   = 'Filter plugin to add Mesosphere metadata'
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_runtime_dependency 'fluentd', '>= 0.10.43'
+  gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 2']
   gem.add_runtime_dependency 'lru_redux', '~> 1.1'
   gem.add_runtime_dependency 'docker-api', '~> 1.23'
   gem.add_runtime_dependency 'oj', '>= 2.13.1'

data/lib/fluent/plugin/filter_mesosphere_filter.rb

@@ -15,7 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Fluent
+require 'docker-api'
+require 'lru_redux'
+require 'oj'
+require 'time'
+require 'fluent/plugin/filter'
+
+module Fluent::Plugin
   # Parses Marathon and Chronos data from docker to make fluentd logs more
   # useful.
   class MesosphereFilter < Filter
@@ -39,11 +45,6 @@ module Fluent
     def configure(conf)
       super
 
-      require 'docker-api'
-      require 'lru_redux'
-      require 'oj'
-      require 'time'
-
       @cache_ttl = :none if @cache_ttl < 0
 
       @cache = LruRedux::TTL::ThreadSafeCache.new(@cache_size, @cache_ttl)
@@ -56,7 +57,7 @@ module Fluent
     # Gets the log event stream and moifies it. This is where the plugin hooks
     # into the fluentd envent stream.
     def filter_stream(tag, es)
-      new_es = MultiEventStream.new
+      new_es = Fluent::MultiEventStream.new
       container_id = ''
 
       container_id = get_container_id_from_tag(tag) if get_container_id_tag

data/test/helper.rb

@@ -28,6 +28,7 @@ end
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
+require 'fluent/test/driver/filter'
 require 'webmock/test_unit'
 WebMock.disable_net_connect!(:allow => "codeclimate.com")
 

data/test/plugin/test_mesosphere.rb

@@ -29,8 +29,8 @@ class AmplifierFilterTest < Test::Unit::TestCase
     namespace_env_var NAMESPACE
   ]
 
-  def create_driver(conf = CONFIG, tag = 'test')
-    Fluent::Test::FilterTestDriver.new(Fluent::MesosphereFilter, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::MesosphereFilter).configure(conf)
   end
 
   def setup_docker_stub(file, docker_api_url)
@@ -53,15 +53,15 @@ class AmplifierFilterTest < Test::Unit::TestCase
   def test_marathon_filter
     setup_marathon_container('foobar123', 'marathon')
 
-    d1 = create_driver(CONFIG, 'docker.foobar123')
-    d1.run do
-      d1.filter('log' => 'Hello World 1')
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag:  'docker.foobar123') do
+      d1.feed('log' => 'Hello World 1')
     end
-    filtered = d1.filtered_as_array
+    filtered = d1.filtered
 
     task_id = 'hello-world.14b0596d-93ea-11e5-a134-124eefe69197'
 
-    log_entry = filtered[0][2]
+    log_entry = filtered[0][1]
 
     assert_equal 'marathon', log_entry['mesos_framework']
     assert_equal 'hello-world', log_entry['app']
@@ -71,30 +71,30 @@ class AmplifierFilterTest < Test::Unit::TestCase
   def test_container_cache
     setup_marathon_container('foobar123', 'marathon')
 
-    d1 = create_driver(CONFIG, 'docker.foobar123')
-    d1.run do
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'docker.foobar123') do
       1000.times do
-        d1.filter('log' => 'Hello World 4')
+        d1.feed('log' => 'Hello World 4')
       end
     end
     docker_api_url = 'http://tcp//example.com:5422/v1.16/containers/foobar123/json'
 
-    assert_equal 1000, d1.filtered_as_array.length
+    assert_equal 1000, d1.filtered.length
     assert_requested(:get, docker_api_url, times: 2)
   end
 
   def test_container_cache_expiration
     setup_marathon_container('foobar123', 'marathon')
 
-    d1 = create_driver(CONFIG2, 'docker.foobar123')
-    d1.run do
-      d1.filter('log' => 'Hello World 4')
+    d1 = create_driver(CONFIG2)
+    d1.run(default_tag: 'docker.foobar123') do
+      d1.feed('log' => 'Hello World 4')
     end
 
     Timecop.travel(Time.now + 10 * 60)
 
-    d1.run do
-      d1.filter('log' => 'Hello World 4')
+    d1.run(default_tag: 'docker.foobar123') do
+      d1.feed('log' => 'Hello World 4')
     end
 
     Timecop.return
@@ -107,14 +107,14 @@ class AmplifierFilterTest < Test::Unit::TestCase
   def test_chronos_filter
     setup_chronos_container
 
-    d1 = create_driver(CONFIG, 'docker.foobar124')
-    d1.run do
-      d1.filter('log' => 'Hello World 1')
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'docker.foobar124') do
+      d1.feed('log' => 'Hello World 1')
     end
-    filtered = d1.filtered_as_array
+    filtered = d1.filtered
 
     task_id = 'ct:1448508194000:0:recurring-transaction2:task'
-    log_entry = filtered[0][2]
+    log_entry = filtered[0][1]
 
     assert_equal 'chronos', log_entry['mesos_framework']
     assert_equal 'some-task-app2-11182015-1718', log_entry['app']
@@ -127,14 +127,14 @@ class AmplifierFilterTest < Test::Unit::TestCase
     file = File.open('test/containers/chronos_bad.json', 'rb')
     setup_docker_stub(file, docker_api_url)
 
-    d1 = create_driver(CONFIG, 'docker.foobar124')
-    d1.run do
-      d1.filter('log' => 'Hello World 1')
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'docker.foobar124') do
+      d1.feed('log' => 'Hello World 1')
     end
-    filtered = d1.filtered_as_array
+    filtered = d1.filtered
 
     task_id = 'ct:1448508194000:0:recurring-transaction3:task'
-    log_entry = filtered[0][2]
+    log_entry = filtered[0][1]
 
     assert_equal 'chronos', log_entry['mesos_framework']
     assert_equal task_id, log_entry['mesos_task_id']
@@ -145,12 +145,12 @@ class AmplifierFilterTest < Test::Unit::TestCase
   def test_merge_json
     setup_chronos_container
 
-    d1 = create_driver(CONFIG, 'docker.foobar124')
-    d1.run do
-      d1.filter('log' => '{"test_key":"Hello World"}')
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'docker.foobar124') do
+      d1.feed('log' => '{"test_key":"Hello World"}')
     end
-    filtered = d1.filtered_as_array
-    log_entry = filtered[0][2]
+    filtered = d1.filtered
+    log_entry = filtered[0][1]
 
     assert_equal 'Hello World', log_entry['test_key']
   end
@@ -158,12 +158,12 @@ class AmplifierFilterTest < Test::Unit::TestCase
   def test_merge_json_with_namespace
     setup_chronos_container
 
-    d1 = create_driver(CONFIG4, 'docker.foobar124')
-    d1.run do
-      d1.filter('log' => '{"test_key":"Hello World"}')
+    d1 = create_driver(CONFIG4)
+    d1.run(default_tag: 'docker.foobar124') do
+      d1.feed('log' => '{"test_key":"Hello World"}')
     end
-    filtered = d1.filtered_as_array
-    log_entry = filtered[0][2]
+    filtered = d1.filtered
+    log_entry = filtered[0][1]
 
     assert_equal 'ns', log_entry['namespace']
     assert_equal 'Hello World', log_entry['ns']['test_key']
@@ -174,15 +174,15 @@ class AmplifierFilterTest < Test::Unit::TestCase
     bad_json1 = '{"test_key":"Hello World"'
     bad_json2 = '{"test_key":"Hello World", "badnews"}'
 
-    d1 = create_driver(CONFIG, 'docker.foobar124')
-    d1.run do
-      d1.filter('log' => bad_json1)
-      d1.filter('log' => bad_json2)
+    d1 = create_driver(CONFIG)
+    d1.run(default_tag: 'docker.foobar124') do
+      d1.feed('log' => bad_json1)
+      d1.feed('log' => bad_json2)
     end
-    filtered = d1.filtered_as_array
+    filtered = d1.filtered
 
-    assert_equal bad_json1, filtered[0][2]['log']
-    assert_equal bad_json2, filtered[1][2]['log']
+    assert_equal bad_json1, filtered[0][1]['log']
+    assert_equal bad_json2, filtered[1][1]['log']
   end
 
   def test_bad_merge_json_with_namespace
@@ -190,30 +190,30 @@ class AmplifierFilterTest < Test::Unit::TestCase
     bad_json1 = '{"test_key":"Hello World"'
     bad_json2 = '{"test_key":"Hello World", "badnews"}'
 
-    d1 = create_driver(CONFIG4, 'docker.foobar124')
-    d1.run do
-      d1.filter('log' => bad_json1)
-      d1.filter('log' => bad_json2)
+    d1 = create_driver(CONFIG4)
+    d1.run(default_tag: 'docker.foobar124') do
+      d1.feed('log' => bad_json1)
+      d1.feed('log' => bad_json2)
     end
-    filtered = d1.filtered_as_array
+    filtered = d1.filtered
 
-    assert_equal bad_json1, filtered[0][2]['log']
-    assert_equal bad_json2, filtered[1][2]['log']
-    assert_equal false, filtered[0][2].key?('ns')
-    assert_equal false, filtered[1][2].key?('ns')
+    assert_equal bad_json1, filtered[0][1]['log']
+    assert_equal bad_json2, filtered[1][1]['log']
+    assert_equal false, filtered[0][1].key?('ns')
+    assert_equal false, filtered[1][1].key?('ns')
   end
 
   def test_container_id_from_record
     setup_marathon_container('somecontainer123', 'marathon2')
 
-    d1 = create_driver(CONFIG3, 'docker')
-    d1.run do
-      d1.filter('log' => 'hello_world', 'container_id' => 'somecontainer123')
+    d1 = create_driver(CONFIG3)
+    d1.run(default_tag: 'docker') do
+      d1.feed('log' => 'hello_world', 'container_id' => 'somecontainer123')
     end
-    filtered = d1.filtered_as_array
+    filtered = d1.filtered
 
     task_id = 'hello-world.14b0596d-93ea-11e5-a134-124eefe69197'
-    log_entry = filtered[0][2]
+    log_entry = filtered[0][1]
 
     assert_equal 'marathon', log_entry['mesos_framework']
     assert_equal 'hello-world', log_entry['app']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mesosphere-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Joseph Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.43
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.43
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Filter plugin to add Mesosphere metadata to fluentd from Chronos and Marathon