logstash-input-courier 1.8.2 → 1.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/logstash/inputs/courier.rb +18 -7
- metadata +22 -28
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1d4a4f6a90af3abe04151e3b084d89acb90ae8fa
|
|
4
|
+
data.tar.gz: 2bbd5fd326a947d3c3f7e888472f6d71c61087e2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1e815b3de267267e41133e1ac0272908216bd26d0e87317af23e885b129db66ce4ba9c4986ba6f30e363d4bcb8557b01aec316e1e89a69d21e3796b51cb37d8e
|
|
7
|
+
data.tar.gz: 0e6497fb44c25c852264076abdb8e8a9e02b1cc998a84c380f45c72f22865bb9dd7cb0cc0e6bf192246ae1f79365e5a84dd362344f73da789e3b6e62e9dfac92
|
|
@@ -31,6 +31,16 @@ module LogStash
|
|
|
31
31
|
milestone 2
|
|
32
32
|
end
|
|
33
33
|
|
|
34
|
+
# Disable raw_events in the Log Courier gem if we're Logstash 1.5.5+ or
|
|
35
|
+
# 2.0.0+. Due to changes in those versions to JrJackson, JSON outputs like
|
|
36
|
+
# elasticsearch can be broken by our use of raw_events (which defaults
|
|
37
|
+
# true). See https://github.com/driskell/log-courier/issues/247
|
|
38
|
+
if Gem::Version.new(LOGSTASH_VERSION) >= Gem::Version.new('1.5.5')
|
|
39
|
+
RAW_EVENTS = false
|
|
40
|
+
else
|
|
41
|
+
RAW_EVENTS = true
|
|
42
|
+
end
|
|
43
|
+
|
|
34
44
|
default :codec, 'plain'
|
|
35
45
|
|
|
36
46
|
# The IP address to listen on
|
|
@@ -107,15 +117,18 @@ module LogStash
|
|
|
107
117
|
end
|
|
108
118
|
end
|
|
109
119
|
|
|
110
|
-
def stop
|
|
111
|
-
@log_courier.stop
|
|
112
|
-
end
|
|
113
|
-
|
|
114
120
|
private
|
|
115
121
|
|
|
116
122
|
def options
|
|
117
|
-
result = {
|
|
123
|
+
result = {
|
|
124
|
+
raw_events: RAW_EVENTS
|
|
125
|
+
}
|
|
118
126
|
|
|
127
|
+
add_plugin_options result
|
|
128
|
+
add_override_options result
|
|
129
|
+
end
|
|
130
|
+
|
|
131
|
+
def add_plugin_options(result)
|
|
119
132
|
[
|
|
120
133
|
:logger, :address, :port, :transport, :ssl_certificate, :ssl_key,
|
|
121
134
|
:ssl_key_passphrase, :ssl_verify, :ssl_verify_default_ca,
|
|
@@ -123,8 +136,6 @@ module LogStash
|
|
|
123
136
|
].each do |k|
|
|
124
137
|
result[k] = send(k)
|
|
125
138
|
end
|
|
126
|
-
|
|
127
|
-
add_override_options result
|
|
128
139
|
end
|
|
129
140
|
|
|
130
141
|
def add_override_options(result)
|
metadata
CHANGED
|
@@ -1,49 +1,43 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: logstash-input-courier
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.8.
|
|
4
|
+
version: 1.8.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jason Woods
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-11-08 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: logstash-core
|
|
15
|
-
requirement: !ruby/object:Gem::Requirement
|
|
16
|
-
requirements:
|
|
17
|
-
- - ">="
|
|
18
|
-
- !ruby/object:Gem::Version
|
|
19
|
-
version: 1.4.0
|
|
20
|
-
- - "<"
|
|
21
|
-
- !ruby/object:Gem::Version
|
|
22
|
-
version: 3.0.0
|
|
23
|
-
type: :runtime
|
|
24
|
-
prerelease: false
|
|
25
15
|
version_requirements: !ruby/object:Gem::Requirement
|
|
26
16
|
requirements:
|
|
27
|
-
- - "
|
|
17
|
+
- - "~>"
|
|
28
18
|
- !ruby/object:Gem::Version
|
|
29
|
-
version: 1.4
|
|
30
|
-
|
|
19
|
+
version: '1.4'
|
|
20
|
+
requirement: !ruby/object:Gem::Requirement
|
|
21
|
+
requirements:
|
|
22
|
+
- - "~>"
|
|
31
23
|
- !ruby/object:Gem::Version
|
|
32
|
-
version:
|
|
24
|
+
version: '1.4'
|
|
25
|
+
prerelease: false
|
|
26
|
+
type: :runtime
|
|
33
27
|
- !ruby/object:Gem::Dependency
|
|
34
28
|
name: log-courier
|
|
35
|
-
|
|
29
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
36
30
|
requirements:
|
|
37
31
|
- - '='
|
|
38
32
|
- !ruby/object:Gem::Version
|
|
39
|
-
version: 1.8.
|
|
40
|
-
|
|
41
|
-
prerelease: false
|
|
42
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
33
|
+
version: 1.8.3
|
|
34
|
+
requirement: !ruby/object:Gem::Requirement
|
|
43
35
|
requirements:
|
|
44
36
|
- - '='
|
|
45
37
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: 1.8.
|
|
38
|
+
version: 1.8.3
|
|
39
|
+
prerelease: false
|
|
40
|
+
type: :runtime
|
|
47
41
|
description: Log Courier Input Logstash Plugin
|
|
48
42
|
email:
|
|
49
43
|
- devel@jasonwoods.me.uk
|
|
@@ -52,13 +46,13 @@ extensions: []
|
|
|
52
46
|
extra_rdoc_files: []
|
|
53
47
|
files:
|
|
54
48
|
- lib/logstash/inputs/courier.rb
|
|
55
|
-
homepage: https://github.com/driskell/
|
|
49
|
+
homepage: https://github.com/driskell/logstash-input-courier
|
|
56
50
|
licenses:
|
|
57
51
|
- Apache
|
|
58
52
|
metadata:
|
|
59
53
|
logstash_plugin: 'true'
|
|
60
54
|
logstash_group: input
|
|
61
|
-
post_install_message:
|
|
55
|
+
post_install_message:
|
|
62
56
|
rdoc_options: []
|
|
63
57
|
require_paths:
|
|
64
58
|
- lib
|
|
@@ -74,8 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
74
68
|
version: '0'
|
|
75
69
|
requirements: []
|
|
76
70
|
rubyforge_project: nowarning
|
|
77
|
-
rubygems_version: 2.4.
|
|
78
|
-
signing_key:
|
|
71
|
+
rubygems_version: 2.4.8
|
|
72
|
+
signing_key:
|
|
79
73
|
specification_version: 4
|
|
80
|
-
summary: Receive events from Log Courier and Logstash using the
|
|
74
|
+
summary: Receive events from Log Courier and Logstash using the Courier protocol
|
|
81
75
|
test_files: []
|