fluent-plugin-mesosphere-filter 0.1.2 → 0.1.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NjEyOWNhN2Y3YTNhNmNlODE1NjJkNTVmMmM5OWM4NDExZmI2NDQ1Mw==
4
+ MGE4N2ZmYjBmZTQxOTkwOTZlZjk4NmFlNDdkNzVlMjIzNWEyNTU2Mg==
5
5
  data.tar.gz: !binary |-
6
- ZWQyNGI1ZTZmNjhmYjk3YmVlYTJkYTYyMDU3YzhiZmNiYjJiZDI5YQ==
6
+ NjdkZTdjZDQ1YTk5MjA1NjVhM2ZjZTExMTM0MTA5ZDQ1MTcwN2E2Mg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YjRiZGE1ZDRhMzkwMTRkOTI5NjFhZmFjOTE0NTllMmQ4ZmJiODVmYTMyNGY1
10
- OWU3OTRjNjdmZTdmOTk2NDQwMGYzMGY1MTFhZWFlMWRmYTkxMzIwNzQ3MDM1
11
- YTU4MzhkOWQxNjI1MzlmMTU5ZGQ2Y2U1YTZiNzhiZDhmN2Y5ZjI=
9
+ MGJiYTRhNGEzZTE1OGU3YTIxOGVhNDMxMmYwNzJmNjdmMTczNzk3N2I2ZmZm
10
+ YmNhODZkM2EyZmZlZTBlZTcwZTgyMjliOTQyZWY1YjBlZDI1MTU1Yjk2OTU0
11
+ NWNkNjM3Y2I4NTFiYzBlOGFjNzljN2JhNTczMDBmMWJiOTY3YjI=
12
12
  data.tar.gz: !binary |-
13
- ODNmMmNmZWNlMmEyN2ZiMTM4ZjdiN2QzZDc1NzQ1ODgyNmI0ODlhODk0NDcw
14
- YTNmZDI2NjY2ZjBmMjBhMmMyNDA3YWU1M2FhNzZiMTNlYTdkM2NmYzljYTU4
15
- YjM3ZTVmZWZjNzM5ZTUwY2M2MGZmM2M2Yjc5NDE4NTk4ZmEzYWU=
13
+ NTBiMWI0ZGQ5ZDIzZTljODlhYWNhODNmM2E1MTY5MjkzMjRkMDY0MTQxMDlh
14
+ YzU0YzBiNTI4NWZhZjdkNTQ0MTNkMTc0Nzc5NDVjMDEwMTU0ZDRiNDlmYTJj
15
+ MzNlZDBjZThiZmQzZDY1NTgwY2Y3ZWU0MGVkZWZhZDkwOTcwZDg=
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |gem|
6
6
  gem.name = 'fluent-plugin-mesosphere-filter'
7
- gem.version = '0.1.2'
7
+ gem.version = '0.1.3'
8
8
  gem.authors = ['Joseph Hughes']
9
9
  gem.email = ['jjhughes57@gmail.com']
10
10
  gem.description = 'Filter plugin to add Mesosphere metadata'
@@ -20,11 +20,11 @@ Gem::Specification.new do |gem|
20
20
 
21
21
  gem.required_ruby_version = '>= 2.0.0'
22
22
 
23
- gem.add_runtime_dependency 'fluentd', '~> 0.12'
23
+
24
24
  gem.add_runtime_dependency 'lru_redux', '~> 1.1'
25
25
  gem.add_runtime_dependency 'docker-api', '~> 1.23'
26
- gem.add_runtime_dependency 'oj'
27
26
 
27
+ gem.add_development_dependency 'fluentd', '~> 0.12'
28
28
  gem.add_development_dependency 'bundler', '~> 1.3'
29
29
  gem.add_development_dependency 'codeclimate-test-reporter'
30
30
  gem.add_development_dependency 'rake'
@@ -18,7 +18,7 @@
18
18
  module Fluent
19
19
  # Parses Marathon and Chronos data from docker to make fluentd logs more
20
20
  # useful.
21
- class MesosphereFilter < Fluent::Filter
21
+ class MesosphereFilter < Filter
22
22
  Fluent::Plugin.register_filter('mesosphere_filter', self)
23
23
 
24
24
  config_param :cache_size, :integer, default: 1000
@@ -31,17 +31,12 @@ module Fluent
31
31
  :string,
32
32
  default: '(?<app>[a-z0-9]([-a-z0-9_]*[a-z0-9_]))-(?<date>[^-]+)-(?<time>[^-]+)-(?<task_type>[^-]+)-(?<run>[^-]+)-(?<epoc>[^-]+)'
33
33
 
34
- def initialize
35
- super
36
- end
37
-
38
34
  # Get the configuration for the plugin
39
35
  def configure(conf)
40
36
  super
41
37
 
42
38
  require 'docker-api'
43
39
  require 'lru_redux'
44
- require 'oj'
45
40
 
46
41
  @cache_ttl = :none if @cache_ttl < 0
47
42
 
@@ -182,8 +177,8 @@ module Fluent
182
177
  log = record['log'].strip
183
178
  if log[0].eql?('{') && log[-1].eql?('}')
184
179
  begin
185
- record = Oj.load(log).merge(record)
186
- rescue Oj::ParseError
180
+ record = JSON.parse(log).merge(record)
181
+ rescue JSON::ParserError
187
182
  end
188
183
  end
189
184
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-mesosphere-filter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joseph Hughes
@@ -10,20 +10,6 @@ bindir: bin
10
10
  cert_chain: []
11
11
  date: 2015-11-29 00:00:00.000000000 Z
12
12
  dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: fluentd
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ~>
18
- - !ruby/object:Gem::Version
19
- version: '0.12'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - ~>
25
- - !ruby/object:Gem::Version
26
- version: '0.12'
27
13
  - !ruby/object:Gem::Dependency
28
14
  name: lru_redux
29
15
  requirement: !ruby/object:Gem::Requirement
@@ -53,19 +39,19 @@ dependencies:
53
39
  - !ruby/object:Gem::Version
54
40
  version: '1.23'
55
41
  - !ruby/object:Gem::Dependency
56
- name: oj
42
+ name: fluentd
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
- - - ! '>='
45
+ - - ~>
60
46
  - !ruby/object:Gem::Version
61
- version: '0'
62
- type: :runtime
47
+ version: '0.12'
48
+ type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
- - - ! '>='
52
+ - - ~>
67
53
  - !ruby/object:Gem::Version
68
- version: '0'
54
+ version: '0.12'
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: bundler
71
57
  requirement: !ruby/object:Gem::Requirement