logstash-output-fluentd 0.9.2 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/logstash/outputs/fluentd.rb +13 -14
  3. data/logstash-output-fluentd.gemspec +3 -4
  4. metadata +23 -39
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bd587dcb03b0430ed615267317d0afcb483b5894
4
- data.tar.gz: c65211a028ea29244c4a49472fa5513b63987fcb
3
+ metadata.gz: 0572ea1ca4a6199cb45326ebc8a452fe4d868f4d
4
+ data.tar.gz: 380aad138ba9518cf89911e62f5fa29a35f5a138
5
5
  SHA512:
6
- metadata.gz: 6d04024bd28a4b982fa2b3bb814fbc6b7a7c1e88e1f58e8bc400c79c0fff8c168ded827bf90b77cd9a69d4180cbc50e3294a3213e75ff406adec8cd9384cc83f
7
- data.tar.gz: 6cdecfbe266124967c93ccf1a6aece9c374212a4d57f8f4699105d3be505f5aeab8c16f983b27d55cd3cee02f6a32da1756626dff57e8e306a2445745d751757
6
+ metadata.gz: 63f518fb08a6c6ffcbc712101f4ff16da97c9d90a9f2e70dc7905fba51fdf467a0af3d6f233ab738729800088b75f2093e0cb92f00f9198f971b37e8f829e3ad
7
+ data.tar.gz: 196cb1b0409c7bfc61ccad5946521d06d41fac6708163088292b3a22a68fea7536fdab4501d49040667ddeb9b8f60acf3b99e292da9101ff4ebcbab62f300b93
data/lib/logstash/outputs/fluentd.rb CHANGED
@@ -5,24 +5,15 @@ require "logstash/json"
5
5
 
6
6
  require "stud/buffer"
7
7
  require "stud/try"
8
- require "socket"
9
8
 
9
+ require "socket"
10
10
  require "msgpack"
11
11
 
12
- class LogStash::Event
13
- def to_msgpack(packer=nil)
14
- # LogStash objects (ex: LogStash::Timestamp) are impossible to serialize by msgpack
15
- begin
16
- @data.reject{|a,b| a == TIMESTAMP }.to_msgpack
17
- rescue ArgumentError, NoMethodError
18
- LogStash::Json.load(LogStash::Json.dump(@data)).to_msgpack
19
- end
20
- end
21
- end
22
-
23
12
  class LogStash::Outputs::Fluentd < LogStash::Outputs::Base
24
13
  include Stud::Buffer
25
14
 
15
+ concurrency :shared
16
+
26
17
  config_name "fluentd"
27
18
 
28
19
  config :host, validate: :string, required: true
@@ -42,6 +33,15 @@ class LogStash::Outputs::Fluentd < LogStash::Outputs::Base
42
33
  require 'rubygems'
43
34
  VERSION = Gem::Specification.load(File.expand_path('../../../../logstash-output-fluentd.gemspec', __FILE__)).version
44
35
 
36
+ def convert_from_event_to_msgpack(event)
37
+ entry = [(event.timestamp.to_i || Time.now.to_i), event.to_hash]
38
+ begin
39
+ entry.to_msgpack
40
+ rescue ArgumentError, NoMethodError
41
+ LogStash::Json.load(LogStash::Json.dump(entry)).to_msgpack
42
+ end
43
+ end
44
+
45
45
  public
46
46
  def register
47
47
  buffer_initialize(
@@ -55,8 +55,7 @@ class LogStash::Outputs::Fluentd < LogStash::Outputs::Base
55
55
  def receive(event)
56
56
  @logger.debug "receive a event"
57
57
 
58
- entry = [(event.timestamp.to_i || Time.now.to_i), event]
59
- buffer_receive(entry.to_msgpack)
58
+ buffer_receive(convert_from_event_to_msgpack(event))
60
59
 
61
60
  @logger.debug "buffered a event"
62
61
  end
data/logstash-output-fluentd.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-output-fluentd'
3
- s.version = "0.9.2"
3
+ s.version = "1.0.0"
4
4
  s.licenses = ["Apache License (2.0)"]
5
5
  s.summary = "Logstash plugin to forward data to fluentd nodes"
6
6
  s.description = "This gem is a logstash plugin to forward data from logstash to fluentd. This gem is not a stand-alone program."
@@ -18,10 +18,9 @@ Gem::Specification.new do |s|
18
18
  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
19
19
 
20
20
  # Gem dependencies
21
- s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
21
+ s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
22
22
  s.add_runtime_dependency "logstash-codec-plain"
23
- s.add_runtime_dependency "stud", "~> 0.0.19"
24
- s.add_runtime_dependency "msgpack", "~> 0.7.1"
23
+ s.add_runtime_dependency "msgpack", "~> 1.0"
25
24
  # s.add_runtime_dependency "jruby-openssl", ">= 0.9.11" # Required to support TLSv1.2 # TODO: for secure-forward support
26
25
  s.add_development_dependency "logstash-devutils"
27
26
  end
metadata CHANGED
@@ -1,93 +1,78 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-output-fluentd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.2
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Satoshi Tagomori
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-25 00:00:00.000000000 Z
11
+ date: 2017-05-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: logstash-core
15
14
  requirement: !ruby/object:Gem::Requirement
16
15
  requirements:
17
16
  - - ">="
18
17
  - !ruby/object:Gem::Version
19
- version: 2.0.0
20
- - - "<"
18
+ version: '1.60'
19
+ - - "<="
21
20
  - !ruby/object:Gem::Version
22
- version: 3.0.0
23
- type: :runtime
21
+ version: '2.99'
22
+ name: logstash-core-plugin-api
24
23
  prerelease: false
24
+ type: :runtime
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 2.0.0
30
- - - "<"
29
+ version: '1.60'
30
+ - - "<="
31
31
  - !ruby/object:Gem::Version
32
- version: 3.0.0
32
+ version: '2.99'
33
33
  - !ruby/object:Gem::Dependency
34
- name: logstash-codec-plain
35
34
  requirement: !ruby/object:Gem::Requirement
36
35
  requirements:
37
36
  - - ">="
38
37
  - !ruby/object:Gem::Version
39
38
  version: '0'
40
- type: :runtime
39
+ name: logstash-codec-plain
41
40
  prerelease: false
41
+ type: :runtime
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - ">="
45
45
  - !ruby/object:Gem::Version
46
46
  version: '0'
47
47
  - !ruby/object:Gem::Dependency
48
- name: stud
49
48
  requirement: !ruby/object:Gem::Requirement
50
49
  requirements:
51
50
  - - "~>"
52
51
  - !ruby/object:Gem::Version
53
- version: 0.0.19
54
- type: :runtime
55
- prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- requirements:
58
- - - "~>"
59
- - !ruby/object:Gem::Version
60
- version: 0.0.19
61
- - !ruby/object:Gem::Dependency
52
+ version: '1.0'
62
53
  name: msgpack
63
- requirement: !ruby/object:Gem::Requirement
64
- requirements:
65
- - - "~>"
66
- - !ruby/object:Gem::Version
67
- version: 0.7.1
68
- type: :runtime
69
54
  prerelease: false
55
+ type: :runtime
70
56
  version_requirements: !ruby/object:Gem::Requirement
71
57
  requirements:
72
58
  - - "~>"
73
59
  - !ruby/object:Gem::Version
74
- version: 0.7.1
60
+ version: '1.0'
75
61
  - !ruby/object:Gem::Dependency
76
- name: logstash-devutils
77
62
  requirement: !ruby/object:Gem::Requirement
78
63
  requirements:
79
64
  - - ">="
80
65
  - !ruby/object:Gem::Version
81
66
  version: '0'
82
- type: :development
67
+ name: logstash-devutils
83
68
  prerelease: false
69
+ type: :development
84
70
  version_requirements: !ruby/object:Gem::Requirement
85
71
  requirements:
86
72
  - - ">="
87
73
  - !ruby/object:Gem::Version
88
74
  version: '0'
89
- description: This gem is a logstash plugin to forward data from logstash to fluentd.
90
- This gem is not a stand-alone program.
75
+ description: This gem is a logstash plugin to forward data from logstash to fluentd. This gem is not a stand-alone program.
91
76
  email: tagomoris@gmail.com
92
77
  executables: []
93
78
  extensions: []
@@ -109,7 +94,7 @@ licenses:
109
94
  metadata:
110
95
  logstash_plugin: 'true'
111
96
  logstash_group: output
112
- post_install_message:
97
+ post_install_message:
113
98
  rdoc_options: []
114
99
  require_paths:
115
100
  - lib
@@ -124,11 +109,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
124
109
  - !ruby/object:Gem::Version
125
110
  version: '0'
126
111
  requirements: []
127
- rubyforge_project:
128
- rubygems_version: 2.5.1
129
- signing_key:
112
+ rubyforge_project:
113
+ rubygems_version: 2.4.8
114
+ signing_key:
130
115
  specification_version: 4
131
116
  summary: Logstash plugin to forward data to fluentd nodes
132
117
  test_files:
133
118
  - spec/outputs/fluentd_spec.rb
134
- has_rdoc: