fluent-plugin-mesosphere-filter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjEyOWNhN2Y3YTNhNmNlODE1NjJkNTVmMmM5OWM4NDExZmI2NDQ1Mw==
+    MGE4N2ZmYjBmZTQxOTkwOTZlZjk4NmFlNDdkNzVlMjIzNWEyNTU2Mg==
   data.tar.gz: !binary |-
-    ZWQyNGI1ZTZmNjhmYjk3YmVlYTJkYTYyMDU3YzhiZmNiYjJiZDI5YQ==
+    NjdkZTdjZDQ1YTk5MjA1NjVhM2ZjZTExMTM0MTA5ZDQ1MTcwN2E2Mg==
 SHA512:
   metadata.gz: !binary |-
-    YjRiZGE1ZDRhMzkwMTRkOTI5NjFhZmFjOTE0NTllMmQ4ZmJiODVmYTMyNGY1
-    OWU3OTRjNjdmZTdmOTk2NDQwMGYzMGY1MTFhZWFlMWRmYTkxMzIwNzQ3MDM1
-    YTU4MzhkOWQxNjI1MzlmMTU5ZGQ2Y2U1YTZiNzhiZDhmN2Y5ZjI=
+    MGJiYTRhNGEzZTE1OGU3YTIxOGVhNDMxMmYwNzJmNjdmMTczNzk3N2I2ZmZm
+    YmNhODZkM2EyZmZlZTBlZTcwZTgyMjliOTQyZWY1YjBlZDI1MTU1Yjk2OTU0
+    NWNkNjM3Y2I4NTFiYzBlOGFjNzljN2JhNTczMDBmMWJiOTY3YjI=
   data.tar.gz: !binary |-
-    ODNmMmNmZWNlMmEyN2ZiMTM4ZjdiN2QzZDc1NzQ1ODgyNmI0ODlhODk0NDcw
-    YTNmZDI2NjY2ZjBmMjBhMmMyNDA3YWU1M2FhNzZiMTNlYTdkM2NmYzljYTU4
-    YjM3ZTVmZWZjNzM5ZTUwY2M2MGZmM2M2Yjc5NDE4NTk4ZmEzYWU=
+    NTBiMWI0ZGQ5ZDIzZTljODlhYWNhODNmM2E1MTY5MjkzMjRkMDY0MTQxMDlh
+    YzU0YzBiNTI4NWZhZjdkNTQ0MTNkMTc0Nzc5NDVjMDEwMTU0ZDRiNDlmYTJj
+    MzNlZDBjZThiZmQzZDY1NTgwY2Y3ZWU0MGVkZWZhZDkwOTcwZDg=

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.2'
+  gem.version       = '0.1.3'
   gem.authors       = ['Joseph Hughes']
   gem.email         = ['jjhughes57@gmail.com']
   gem.description   = 'Filter plugin to add Mesosphere metadata'
@@ -20,11 +20,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_runtime_dependency 'fluentd', '~> 0.12'
+
   gem.add_runtime_dependency 'lru_redux', '~> 1.1'
   gem.add_runtime_dependency 'docker-api', '~> 1.23'
-  gem.add_runtime_dependency 'oj'
 
+  gem.add_development_dependency 'fluentd', '~> 0.12'
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'codeclimate-test-reporter'
   gem.add_development_dependency 'rake'

data/lib/fluent/plugin/mesosphere.rb

@@ -18,7 +18,7 @@
 module Fluent
   # Parses Marathon and Chronos data from docker to make fluentd logs more
   # useful.
-  class MesosphereFilter < Fluent::Filter
+  class MesosphereFilter < Filter
     Fluent::Plugin.register_filter('mesosphere_filter', self)
 
     config_param :cache_size, :integer, default: 1000
@@ -31,17 +31,12 @@ module Fluent
                  :string,
                  default: '(?<app>[a-z0-9]([-a-z0-9_]*[a-z0-9_]))-(?<date>[^-]+)-(?<time>[^-]+)-(?<task_type>[^-]+)-(?<run>[^-]+)-(?<epoc>[^-]+)'
 
-    def initialize
-      super
-    end
-
     # Get the configuration for the plugin
     def configure(conf)
       super
 
       require 'docker-api'
       require 'lru_redux'
-      require 'oj'
 
       @cache_ttl = :none if @cache_ttl < 0
 
@@ -182,8 +177,8 @@ module Fluent
         log = record['log'].strip
         if log[0].eql?('{') && log[-1].eql?('}')
           begin
-            record = Oj.load(log).merge(record)
-          rescue Oj::ParseError
+            record = JSON.parse(log).merge(record)
+          rescue JSON::ParserError
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mesosphere-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joseph Hughes
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.23'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '0.12'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement