logstash-core 6.8.14-java → 7.0.0.alpha1-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/logstash-core/version.rb +3 -1
- data/lib/logstash/agent.rb +69 -85
- data/lib/logstash/api/modules/stats.rb +1 -1
- data/lib/logstash/compiler/lscl.rb +7 -7
- data/lib/logstash/config/config_ast.rb +1 -1
- data/lib/logstash/config/mixin.rb +1 -1
- data/lib/logstash/config/modules_common.rb +3 -3
- data/lib/logstash/dependency_report.rb +1 -2
- data/lib/logstash/environment.rb +4 -9
- data/lib/logstash/event.rb +1 -24
- data/lib/logstash/filter_delegator.rb +69 -2
- data/lib/logstash/filters/base.rb +2 -0
- data/lib/logstash/instrument/metric_store.rb +1 -1
- data/lib/logstash/instrument/periodic_poller/dlq.rb +7 -5
- data/lib/logstash/instrument/periodic_poller/jvm.rb +3 -3
- data/lib/logstash/instrument/periodic_poller/pq.rb +8 -6
- data/lib/logstash/instrument/periodic_pollers.rb +3 -3
- data/lib/logstash/java_pipeline.rb +11 -38
- data/lib/logstash/modules/kibana_config.rb +1 -1
- data/lib/logstash/modules/logstash_config.rb +1 -1
- data/lib/logstash/patches/resolv.rb +32 -17
- data/lib/logstash/pipeline.rb +11 -28
- data/lib/logstash/pipeline_action/base.rb +1 -1
- data/lib/logstash/pipeline_action/create.rb +13 -7
- data/lib/logstash/pipeline_action/reload.rb +12 -35
- data/lib/logstash/pipeline_action/stop.rb +6 -4
- data/lib/logstash/pipeline_settings.rb +1 -2
- data/lib/logstash/plugins/registry.rb +2 -5
- data/lib/logstash/runner.rb +0 -24
- data/lib/logstash/settings.rb +5 -5
- data/lib/logstash/state_resolver.rb +5 -5
- data/lib/logstash/util.rb +1 -11
- data/lib/logstash/util/duration_formatter.rb +1 -1
- data/lib/logstash/util/safe_uri.rb +0 -1
- data/lib/logstash/util/substitution_variables.rb +1 -22
- data/lib/logstash/util/thread_dump.rb +1 -1
- data/locales/en.yml +7 -16
- data/logstash-core.gemspec +11 -2
- data/spec/logstash/acked_queue_concurrent_stress_spec.rb +2 -2
- data/spec/logstash/agent/converge_spec.rb +31 -25
- data/spec/logstash/agent/metrics_spec.rb +1 -1
- data/spec/logstash/agent_spec.rb +7 -6
- data/spec/logstash/compiler/compiler_spec.rb +0 -28
- data/spec/logstash/config/config_ast_spec.rb +0 -15
- data/spec/logstash/config/mixin_spec.rb +2 -3
- data/spec/logstash/converge_result_spec.rb +1 -1
- data/spec/logstash/environment_spec.rb +4 -4
- data/spec/logstash/event_spec.rb +2 -10
- data/spec/logstash/filter_delegator_spec.rb +12 -2
- data/spec/logstash/filters/base_spec.rb +9 -45
- data/spec/logstash/instrument/periodic_poller/cgroup_spec.rb +2 -0
- data/spec/logstash/instrument/wrapped_write_client_spec.rb +1 -1
- data/spec/logstash/java_filter_delegator_spec.rb +11 -1
- data/spec/logstash/legacy_ruby_event_spec.rb +5 -6
- data/spec/logstash/patches_spec.rb +3 -1
- data/spec/logstash/pipeline_action/create_spec.rb +8 -14
- data/spec/logstash/pipeline_action/reload_spec.rb +9 -16
- data/spec/logstash/pipeline_action/stop_spec.rb +3 -4
- data/spec/logstash/queue_factory_spec.rb +1 -2
- data/spec/logstash/runner_spec.rb +0 -2
- data/spec/logstash/settings/array_coercible_spec.rb +1 -1
- data/spec/logstash/settings/bytes_spec.rb +2 -2
- data/spec/logstash/settings/port_range_spec.rb +1 -1
- data/spec/logstash/settings_spec.rb +0 -10
- data/spec/logstash/state_resolver_spec.rb +22 -26
- data/spec/logstash/util/safe_uri_spec.rb +0 -40
- data/spec/logstash/util/secretstore_spec.rb +1 -1
- data/spec/logstash/util/time_value_spec.rb +1 -1
- data/spec/logstash/util/wrapped_acked_queue_spec.rb +1 -1
- data/spec/logstash/webserver_spec.rb +5 -9
- data/spec/support/matchers.rb +19 -25
- data/spec/support/shared_contexts.rb +3 -3
- data/versions-gem-copy.yml +9 -9
- metadata +31 -44
- data/lib/logstash/patches/resolv_9270.rb +0 -2903
- data/lib/logstash/pipelines_registry.rb +0 -166
- data/lib/logstash/util/lazy_singleton.rb +0 -33
- data/spec/logstash/jruby_version_spec.rb +0 -15
- data/spec/logstash/pipelines_registry_spec.rb +0 -220
@@ -18,17 +18,17 @@ describe LogStash::StateResolver do
|
|
18
18
|
|
19
19
|
after do
|
20
20
|
# ensure that the the created pipeline are closed
|
21
|
-
|
21
|
+
running_pipelines.each { |_, pipeline| pipeline.close }
|
22
22
|
end
|
23
23
|
|
24
24
|
context "when no pipeline is running" do
|
25
|
-
let(:
|
25
|
+
let(:running_pipelines) { {} }
|
26
26
|
|
27
27
|
context "no pipeline configs is received" do
|
28
28
|
let(:pipeline_configs) { [] }
|
29
29
|
|
30
30
|
it "returns no action" do
|
31
|
-
expect(subject.resolve(
|
31
|
+
expect(subject.resolve(running_pipelines, pipeline_configs).size).to eq(0)
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
@@ -36,7 +36,7 @@ describe LogStash::StateResolver do
|
|
36
36
|
let(:pipeline_configs) { [mock_pipeline_config(:hello_world)] }
|
37
37
|
|
38
38
|
it "returns some actions" do
|
39
|
-
expect(subject.resolve(
|
39
|
+
expect(subject.resolve(running_pipelines, pipeline_configs)).to have_actions(
|
40
40
|
[:create, :hello_world],
|
41
41
|
)
|
42
42
|
end
|
@@ -47,17 +47,13 @@ describe LogStash::StateResolver do
|
|
47
47
|
context "when a pipeline is running" do
|
48
48
|
let(:main_pipeline) { mock_pipeline(:main) }
|
49
49
|
let(:main_pipeline_config) { main_pipeline.pipeline_config }
|
50
|
-
let(:
|
51
|
-
r = LogStash::PipelinesRegistry.new
|
52
|
-
r.create_pipeline(:main, main_pipeline) { true }
|
53
|
-
r
|
54
|
-
end
|
50
|
+
let(:running_pipelines) { { :main => main_pipeline } }
|
55
51
|
|
56
52
|
context "when the pipeline config contains a new one and the existing" do
|
57
53
|
let(:pipeline_configs) { [mock_pipeline_config(:hello_world), main_pipeline_config ] }
|
58
54
|
|
59
55
|
it "creates the new one and keep the other one" do
|
60
|
-
expect(subject.resolve(
|
56
|
+
expect(subject.resolve(running_pipelines, pipeline_configs)).to have_actions(
|
61
57
|
[:create, :hello_world],
|
62
58
|
)
|
63
59
|
end
|
@@ -66,7 +62,7 @@ describe LogStash::StateResolver do
|
|
66
62
|
let(:pipeline_configs) { [mock_pipeline_config(:hello_world)] }
|
67
63
|
|
68
64
|
it "creates the new one and stop the old one one" do
|
69
|
-
expect(subject.resolve(
|
65
|
+
expect(subject.resolve(running_pipelines, pipeline_configs)).to have_actions(
|
70
66
|
[:create, :hello_world],
|
71
67
|
[:stop, :main]
|
72
68
|
)
|
@@ -77,7 +73,7 @@ describe LogStash::StateResolver do
|
|
77
73
|
let(:pipeline_configs) { [] }
|
78
74
|
|
79
75
|
it "stops the old one one" do
|
80
|
-
expect(subject.resolve(
|
76
|
+
expect(subject.resolve(running_pipelines, pipeline_configs)).to have_actions(
|
81
77
|
[:stop, :main]
|
82
78
|
)
|
83
79
|
end
|
@@ -87,7 +83,7 @@ describe LogStash::StateResolver do
|
|
87
83
|
let(:pipeline_configs) { [mock_pipeline_config(:main, "input { generator {}}")] }
|
88
84
|
|
89
85
|
it "reloads the old one one" do
|
90
|
-
expect(subject.resolve(
|
86
|
+
expect(subject.resolve(running_pipelines, pipeline_configs)).to have_actions(
|
91
87
|
[:reload, :main]
|
92
88
|
)
|
93
89
|
end
|
@@ -96,21 +92,21 @@ describe LogStash::StateResolver do
|
|
96
92
|
end
|
97
93
|
|
98
94
|
context "when we have a lot of pipeline running" do
|
99
|
-
let(:
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
95
|
+
let(:running_pipelines) do
|
96
|
+
{
|
97
|
+
:main1 => mock_pipeline(:main1),
|
98
|
+
:main2 => mock_pipeline(:main2),
|
99
|
+
:main3 => mock_pipeline(:main3),
|
100
|
+
:main4 => mock_pipeline(:main4),
|
101
|
+
:main5 => mock_pipeline(:main5),
|
102
|
+
:main6 => mock_pipeline(:main6),
|
103
|
+
}
|
108
104
|
end
|
109
105
|
|
110
106
|
context "without system pipeline" do
|
111
107
|
let(:pipeline_configs) do
|
112
108
|
[
|
113
|
-
|
109
|
+
running_pipelines[:main1].pipeline_config,
|
114
110
|
mock_pipeline_config(:main9),
|
115
111
|
mock_pipeline_config(:main5, "input { generator {}}"),
|
116
112
|
mock_pipeline_config(:main3, "input { generator {}}"),
|
@@ -119,7 +115,7 @@ describe LogStash::StateResolver do
|
|
119
115
|
end
|
120
116
|
|
121
117
|
it "generates actions required to converge" do
|
122
|
-
expect(subject.resolve(
|
118
|
+
expect(subject.resolve(running_pipelines, pipeline_configs)).to have_actions(
|
123
119
|
[:create, :main7],
|
124
120
|
[:create, :main9],
|
125
121
|
[:reload, :main3],
|
@@ -134,7 +130,7 @@ describe LogStash::StateResolver do
|
|
134
130
|
context "with system pipeline" do
|
135
131
|
let(:pipeline_configs) do
|
136
132
|
[
|
137
|
-
|
133
|
+
running_pipelines[:main1].pipeline_config,
|
138
134
|
mock_pipeline_config(:main9),
|
139
135
|
mock_pipeline_config(:main5, "input { generator {}}"),
|
140
136
|
mock_pipeline_config(:main3, "input { generator {}}"),
|
@@ -144,7 +140,7 @@ describe LogStash::StateResolver do
|
|
144
140
|
end
|
145
141
|
|
146
142
|
it "creates the system pipeline before user defined pipelines" do
|
147
|
-
expect(subject.resolve(
|
143
|
+
expect(subject.resolve(running_pipelines, pipeline_configs)).to have_actions(
|
148
144
|
[:create, :monitoring],
|
149
145
|
[:create, :main7],
|
150
146
|
[:create, :main9],
|
@@ -32,45 +32,5 @@ module LogStash module Util
|
|
32
32
|
end
|
33
33
|
end
|
34
34
|
end
|
35
|
-
|
36
|
-
describe "#initialize" do
|
37
|
-
context 'when host is required' do
|
38
|
-
MALFORMED_URIS = ['http:/user:pass@localhost:9600', 'http:/localhost', 'http:/localhost:9600', 'h;localhost', 'http:://localhost']
|
39
|
-
|
40
|
-
context 'malformed uris via string' do
|
41
|
-
MALFORMED_URIS.each do |arg|
|
42
|
-
it "#{arg}: should raise an error" do
|
43
|
-
expect{LogStash::Util::SafeURI.new(arg)}.to raise_error(ArgumentError)
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
context 'malformed uris via java.net.URI' do
|
49
|
-
MALFORMED_URIS.each do |arg|
|
50
|
-
it "#{arg}: should raise an error" do
|
51
|
-
java_uri = java.net.URI.new(arg)
|
52
|
-
expect{LogStash::Util::SafeURI.new(java_uri)}.to raise_error(ArgumentError)
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
context 'malformed uris via Ruby URI' do
|
58
|
-
MALFORMED_URIS.each do |arg|
|
59
|
-
it "#{arg}: should raise an error" do
|
60
|
-
ruby_uri = URI.parse(arg)
|
61
|
-
expect{LogStash::Util::SafeURI.new(ruby_uri)}.to raise_error(ArgumentError)
|
62
|
-
end
|
63
|
-
end
|
64
|
-
end
|
65
|
-
|
66
|
-
context 'uris with a valid host' do
|
67
|
-
['http://user:pass@notlocalhost:9600', 'http://notlocalhost', 'https://notlocalhost:9600', '//notlocalhost', 'notlocalhost', 'notlocalhost:9200'].each do |arg|
|
68
|
-
it "#{arg}: should resolve host correctly" do
|
69
|
-
expect(LogStash::Util::SafeURI.new(arg).host).to eq('notlocalhost')
|
70
|
-
end
|
71
|
-
end
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|
75
35
|
end
|
76
36
|
end end
|
@@ -12,7 +12,7 @@ describe SecretStoreExt do
|
|
12
12
|
end
|
13
13
|
|
14
14
|
it "should be not exist" do
|
15
|
-
expect(subject.exists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to
|
15
|
+
expect(subject.exists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_falsey
|
16
16
|
expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_nil
|
17
17
|
end
|
18
18
|
end
|
@@ -51,7 +51,7 @@ describe TimeValue do
|
|
51
51
|
a = TimeValue.from_value(32)
|
52
52
|
fail "should not parse"
|
53
53
|
rescue ArgumentError => e
|
54
|
-
expect(e.message).to eq("value is not a string: 32 [
|
54
|
+
expect(e.message).to eq("value is not a string: 32 [Fixnum]")
|
55
55
|
end
|
56
56
|
end
|
57
57
|
end
|
@@ -38,7 +38,7 @@ describe LogStash::WrappedAckedQueue do
|
|
38
38
|
let(:checkpoint_writes) { 1024 }
|
39
39
|
let(:checkpoint_interval) { 0 }
|
40
40
|
let(:path) { Stud::Temporary.directory }
|
41
|
-
let(:queue) { LogStash::WrappedAckedQueue.new(path, page_capacity, max_events, checkpoint_acks, checkpoint_writes, checkpoint_interval,
|
41
|
+
let(:queue) { LogStash::WrappedAckedQueue.new(path, page_capacity, max_events, checkpoint_acks, checkpoint_writes, checkpoint_interval, max_bytes) }
|
42
42
|
|
43
43
|
after do
|
44
44
|
queue.close
|
@@ -12,7 +12,7 @@ def block_ports(range)
|
|
12
12
|
|
13
13
|
range.each do |port|
|
14
14
|
begin
|
15
|
-
server = TCPServer.new("
|
15
|
+
server = TCPServer.new("localhost", port)
|
16
16
|
servers << server
|
17
17
|
rescue => e
|
18
18
|
# The port can already be taken
|
@@ -45,7 +45,7 @@ describe LogStash::WebServer do
|
|
45
45
|
|
46
46
|
subject { LogStash::WebServer.new(logger,
|
47
47
|
agent,
|
48
|
-
{ :http_host => "
|
48
|
+
{ :http_host => "localhost", :http_ports => port_range })}
|
49
49
|
|
50
50
|
let(:port_range) { 10000..10010 }
|
51
51
|
|
@@ -89,9 +89,8 @@ describe LogStash::WebServer do
|
|
89
89
|
after(:each) { free_ports(@servers) }
|
90
90
|
|
91
91
|
context "when we have available ports" do
|
92
|
-
let(:blocked_range) { 10000..10005 }
|
93
92
|
before(:each) do
|
94
|
-
@servers = block_ports(
|
93
|
+
@servers = block_ports(10000..10005)
|
95
94
|
end
|
96
95
|
|
97
96
|
it "successfully find an available port" do
|
@@ -100,13 +99,10 @@ describe LogStash::WebServer do
|
|
100
99
|
end
|
101
100
|
|
102
101
|
sleep(1)
|
103
|
-
address = subject.address
|
104
|
-
port = address.split(":").last.to_i
|
105
|
-
expect(port_range).to cover(port)
|
106
|
-
expect(blocked_range).to_not cover(port)
|
107
102
|
|
108
|
-
response = open("http
|
103
|
+
response = open("http://localhost:10006").read
|
109
104
|
expect { LogStash::Json.load(response) }.not_to raise_error
|
105
|
+
expect(subject.address).to eq("localhost:10006")
|
110
106
|
|
111
107
|
subject.stop
|
112
108
|
t.join
|
data/spec/support/matchers.rb
CHANGED
@@ -51,50 +51,44 @@ end
|
|
51
51
|
|
52
52
|
RSpec::Matchers.define :have_pipeline? do |pipeline_config|
|
53
53
|
match do |agent|
|
54
|
-
pipeline =
|
55
|
-
|
56
|
-
pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
|
57
|
-
expect(pipeline).to_not be_nil
|
58
|
-
end
|
54
|
+
pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
|
55
|
+
expect(pipeline).to_not be_nil
|
59
56
|
expect(pipeline.config_str).to eq(pipeline_config.config_string)
|
60
|
-
expect(agent.running_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
|
61
57
|
end
|
62
58
|
|
63
59
|
match_when_negated do |agent|
|
64
|
-
pipeline =
|
65
|
-
|
66
|
-
pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
|
67
|
-
expect(pipeline).to_not be_nil
|
68
|
-
end
|
69
|
-
# either the pipeline_id is not in the running pipelines OR it is but have different configurations
|
70
|
-
expect(!agent.running_pipelines.keys.map(&:to_s).include?(pipeline_config.pipeline_id.to_s) || pipeline.config_str != pipeline_config.config_string).to be_truthy
|
60
|
+
pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
|
61
|
+
pipeline.nil? || pipeline.config_str != pipeline_config.config_string
|
71
62
|
end
|
72
63
|
end
|
73
64
|
|
74
65
|
RSpec::Matchers.define :have_running_pipeline? do |pipeline_config|
|
75
66
|
match do |agent|
|
76
|
-
|
77
|
-
try(30) do
|
67
|
+
Stud.try(10.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
|
78
68
|
pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
|
79
69
|
expect(pipeline).to_not be_nil
|
70
|
+
expect(pipeline.config_str).to eq(pipeline_config.config_string)
|
71
|
+
expect(pipeline.running?).to be_truthy
|
80
72
|
end
|
81
|
-
expect(pipeline.config_str).to eq(pipeline_config.config_string)
|
82
|
-
expect(pipeline.running?).to be_truthy
|
83
|
-
expect(agent.running_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
|
84
73
|
end
|
85
74
|
|
86
75
|
failure_message do |agent|
|
87
76
|
pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
|
88
77
|
|
89
78
|
if pipeline.nil?
|
90
|
-
"Expected pipeline to exist and running, be we cannot find
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
79
|
+
"Expected pipeline to exist and running, be we cannot find `#{pipeline_config.pipeline_id}` in the running pipelines `#{agent.pipelines.keys.join(",")}`"
|
80
|
+
else
|
81
|
+
if pipeline.running? == false
|
82
|
+
"Found `#{pipeline_config.pipeline_id}` in the list of pipelines but its not running"
|
83
|
+
elsif pipeline.config_str != pipeline_config.config_string
|
84
|
+
"Found `#{pipeline_config.pipeline_id}` in the list of pipelines and running, but the config_string doesn't match,
|
85
|
+
Expected:
|
86
|
+
#{pipeline_config.config_string}
|
87
|
+
|
88
|
+
got:
|
89
|
+
#{pipeline.config_str}"
|
90
|
+
end
|
96
91
|
end
|
97
|
-
end
|
98
92
|
end
|
99
93
|
|
100
94
|
match_when_negated do
|
@@ -26,12 +26,12 @@ shared_context "api setup" do
|
|
26
26
|
@agent.execute
|
27
27
|
pipeline_config = mock_pipeline_config(:main, "input { generator { id => '123' } } output { null {} }")
|
28
28
|
pipeline_creator = LogStash::PipelineAction::Create.new(pipeline_config, @agent.metric)
|
29
|
-
@
|
30
|
-
expect(pipeline_creator.execute(@agent, @
|
29
|
+
@pipelines = java.util.concurrent.ConcurrentHashMap.new
|
30
|
+
expect(pipeline_creator.execute(@agent, @pipelines)).to be_truthy
|
31
31
|
end
|
32
32
|
|
33
33
|
after :all do
|
34
|
-
@
|
34
|
+
@pipelines.each do |_, pipeline|
|
35
35
|
pipeline.shutdown
|
36
36
|
pipeline.thread.join
|
37
37
|
end
|
data/versions-gem-copy.yml
CHANGED
@@ -1,27 +1,27 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
logstash
|
2
|
+
# alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
|
3
|
+
logstash: 7.0.0
|
4
|
+
logstash-core: 7.0.0
|
4
5
|
logstash-core-plugin-api: 2.1.16
|
5
6
|
|
6
7
|
# jruby must reference a *released* version of jruby which can be downloaded from the official download url
|
7
8
|
# *and* for which jars artifacts are published for compile-time
|
8
9
|
jruby:
|
9
|
-
version: 9.
|
10
|
-
sha1:
|
10
|
+
version: 9.1.13.0
|
11
|
+
sha1: 815bac27d5daa1459a4477d6d80584f007ce6a68
|
11
12
|
|
12
13
|
# jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby for logstash runtime only,
|
13
14
|
# not for the compile-time jars
|
14
15
|
#
|
15
16
|
#jruby-runtime-override:
|
16
|
-
# url: http://ci.jruby.org/snapshots/previous/jruby-bin-9.
|
17
|
-
# version: 9.
|
17
|
+
# url: http://ci.jruby.org/snapshots/previous/jruby-bin-9.1.13.0-SNAPSHOT.tar.gz
|
18
|
+
# version: 9.1.13.0-SNAPSHOT
|
18
19
|
# sha1: IGNORE
|
19
20
|
|
20
21
|
# Note: this file is copied to the root of logstash-core because its gemspec needs it when
|
21
22
|
# bundler evaluates the gemspec via bin/logstash
|
22
23
|
# Ensure Jackson version here is kept in sync with version used by jrjackson gem
|
23
|
-
jrjackson: 0.4.
|
24
|
-
jackson: 2.9.
|
25
|
-
jackson-databind: 2.9.10.1
|
24
|
+
jrjackson: 0.4.6
|
25
|
+
jackson: 2.9.5
|
26
26
|
|
27
27
|
# This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated.
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 7.0.0.alpha1
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-11-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -17,8 +17,8 @@ dependencies:
|
|
17
17
|
- !ruby/object:Gem::Version
|
18
18
|
version: 0.10.1
|
19
19
|
name: pry
|
20
|
-
type: :runtime
|
21
20
|
prerelease: false
|
21
|
+
type: :runtime
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
@@ -31,8 +31,8 @@ dependencies:
|
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: 0.0.19
|
33
33
|
name: stud
|
34
|
-
type: :runtime
|
35
34
|
prerelease: false
|
35
|
+
type: :runtime
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
@@ -45,8 +45,8 @@ dependencies:
|
|
45
45
|
- !ruby/object:Gem::Version
|
46
46
|
version: 0.6.5
|
47
47
|
name: clamp
|
48
|
-
type: :runtime
|
49
48
|
prerelease: false
|
49
|
+
type: :runtime
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
@@ -59,8 +59,8 @@ dependencies:
|
|
59
59
|
- !ruby/object:Gem::Version
|
60
60
|
version: 0.0.4
|
61
61
|
name: filesize
|
62
|
-
type: :runtime
|
63
62
|
prerelease: false
|
63
|
+
type: :runtime
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - '='
|
@@ -73,8 +73,8 @@ dependencies:
|
|
73
73
|
- !ruby/object:Gem::Version
|
74
74
|
version: 0.8.3
|
75
75
|
name: gems
|
76
|
-
type: :runtime
|
77
76
|
prerelease: false
|
77
|
+
type: :runtime
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
@@ -90,8 +90,8 @@ dependencies:
|
|
90
90
|
- !ruby/object:Gem::Version
|
91
91
|
version: 1.0.5
|
92
92
|
name: concurrent-ruby
|
93
|
-
type: :runtime
|
94
93
|
prerelease: false
|
94
|
+
type: :runtime
|
95
95
|
version_requirements: !ruby/object:Gem::Requirement
|
96
96
|
requirements:
|
97
97
|
- - "~>"
|
@@ -103,23 +103,17 @@ dependencies:
|
|
103
103
|
- !ruby/object:Gem::Dependency
|
104
104
|
requirement: !ruby/object:Gem::Requirement
|
105
105
|
requirements:
|
106
|
-
- -
|
107
|
-
- !ruby/object:Gem::Version
|
108
|
-
version: '1.6'
|
109
|
-
- - ">="
|
106
|
+
- - '='
|
110
107
|
- !ruby/object:Gem::Version
|
111
|
-
version: 1.6.
|
108
|
+
version: 1.6.6
|
112
109
|
name: rack
|
113
|
-
type: :runtime
|
114
110
|
prerelease: false
|
111
|
+
type: :runtime
|
115
112
|
version_requirements: !ruby/object:Gem::Requirement
|
116
113
|
requirements:
|
117
|
-
- -
|
118
|
-
- !ruby/object:Gem::Version
|
119
|
-
version: '1.6'
|
120
|
-
- - ">="
|
114
|
+
- - '='
|
121
115
|
- !ruby/object:Gem::Version
|
122
|
-
version: 1.6.
|
116
|
+
version: 1.6.6
|
123
117
|
- !ruby/object:Gem::Dependency
|
124
118
|
requirement: !ruby/object:Gem::Requirement
|
125
119
|
requirements:
|
@@ -130,8 +124,8 @@ dependencies:
|
|
130
124
|
- !ruby/object:Gem::Version
|
131
125
|
version: 1.4.6
|
132
126
|
name: sinatra
|
133
|
-
type: :runtime
|
134
127
|
prerelease: false
|
128
|
+
type: :runtime
|
135
129
|
version_requirements: !ruby/object:Gem::Requirement
|
136
130
|
requirements:
|
137
131
|
- - "~>"
|
@@ -147,8 +141,8 @@ dependencies:
|
|
147
141
|
- !ruby/object:Gem::Version
|
148
142
|
version: '2.16'
|
149
143
|
name: puma
|
150
|
-
type: :runtime
|
151
144
|
prerelease: false
|
145
|
+
type: :runtime
|
152
146
|
version_requirements: !ruby/object:Gem::Requirement
|
153
147
|
requirements:
|
154
148
|
- - "~>"
|
@@ -161,8 +155,8 @@ dependencies:
|
|
161
155
|
- !ruby/object:Gem::Version
|
162
156
|
version: 0.9.20
|
163
157
|
name: jruby-openssl
|
164
|
-
type: :runtime
|
165
158
|
prerelease: false
|
159
|
+
type: :runtime
|
166
160
|
version_requirements: !ruby/object:Gem::Requirement
|
167
161
|
requirements:
|
168
162
|
- - ">="
|
@@ -175,8 +169,8 @@ dependencies:
|
|
175
169
|
- !ruby/object:Gem::Version
|
176
170
|
version: 0.10.6
|
177
171
|
name: chronic_duration
|
178
|
-
type: :runtime
|
179
172
|
prerelease: false
|
173
|
+
type: :runtime
|
180
174
|
version_requirements: !ruby/object:Gem::Requirement
|
181
175
|
requirements:
|
182
176
|
- - '='
|
@@ -189,8 +183,8 @@ dependencies:
|
|
189
183
|
- !ruby/object:Gem::Version
|
190
184
|
version: 1.5.0
|
191
185
|
name: treetop
|
192
|
-
type: :runtime
|
193
186
|
prerelease: false
|
187
|
+
type: :runtime
|
194
188
|
version_requirements: !ruby/object:Gem::Requirement
|
195
189
|
requirements:
|
196
190
|
- - "<"
|
@@ -203,8 +197,8 @@ dependencies:
|
|
203
197
|
- !ruby/object:Gem::Version
|
204
198
|
version: 0.6.9
|
205
199
|
name: i18n
|
206
|
-
type: :runtime
|
207
200
|
prerelease: false
|
201
|
+
type: :runtime
|
208
202
|
version_requirements: !ruby/object:Gem::Requirement
|
209
203
|
requirements:
|
210
204
|
- - '='
|
@@ -217,8 +211,8 @@ dependencies:
|
|
217
211
|
- !ruby/object:Gem::Version
|
218
212
|
version: 0.6.1
|
219
213
|
name: minitar
|
220
|
-
type: :runtime
|
221
214
|
prerelease: false
|
215
|
+
type: :runtime
|
222
216
|
version_requirements: !ruby/object:Gem::Requirement
|
223
217
|
requirements:
|
224
218
|
- - "~>"
|
@@ -231,8 +225,8 @@ dependencies:
|
|
231
225
|
- !ruby/object:Gem::Version
|
232
226
|
version: 1.2.1
|
233
227
|
name: rubyzip
|
234
|
-
type: :runtime
|
235
228
|
prerelease: false
|
229
|
+
type: :runtime
|
236
230
|
version_requirements: !ruby/object:Gem::Requirement
|
237
231
|
requirements:
|
238
232
|
- - "~>"
|
@@ -245,8 +239,8 @@ dependencies:
|
|
245
239
|
- !ruby/object:Gem::Version
|
246
240
|
version: 0.3.5
|
247
241
|
name: thread_safe
|
248
|
-
type: :runtime
|
249
242
|
prerelease: false
|
243
|
+
type: :runtime
|
250
244
|
version_requirements: !ruby/object:Gem::Requirement
|
251
245
|
requirements:
|
252
246
|
- - "~>"
|
@@ -257,15 +251,15 @@ dependencies:
|
|
257
251
|
requirements:
|
258
252
|
- - '='
|
259
253
|
- !ruby/object:Gem::Version
|
260
|
-
version: 0.4.
|
254
|
+
version: 0.4.6
|
261
255
|
name: jrjackson
|
262
|
-
type: :runtime
|
263
256
|
prerelease: false
|
257
|
+
type: :runtime
|
264
258
|
version_requirements: !ruby/object:Gem::Requirement
|
265
259
|
requirements:
|
266
260
|
- - '='
|
267
261
|
- !ruby/object:Gem::Version
|
268
|
-
version: 0.4.
|
262
|
+
version: 0.4.6
|
269
263
|
- !ruby/object:Gem::Dependency
|
270
264
|
requirement: !ruby/object:Gem::Requirement
|
271
265
|
requirements:
|
@@ -276,8 +270,8 @@ dependencies:
|
|
276
270
|
- !ruby/object:Gem::Version
|
277
271
|
version: 5.0.4
|
278
272
|
name: elasticsearch
|
279
|
-
type: :runtime
|
280
273
|
prerelease: false
|
274
|
+
type: :runtime
|
281
275
|
version_requirements: !ruby/object:Gem::Requirement
|
282
276
|
requirements:
|
283
277
|
- - "~>"
|
@@ -296,8 +290,8 @@ dependencies:
|
|
296
290
|
- !ruby/object:Gem::Version
|
297
291
|
version: 1.0.0
|
298
292
|
name: manticore
|
299
|
-
type: :runtime
|
300
293
|
prerelease: false
|
294
|
+
type: :runtime
|
301
295
|
version_requirements: !ruby/object:Gem::Requirement
|
302
296
|
requirements:
|
303
297
|
- - ">="
|
@@ -420,7 +414,6 @@ files:
|
|
420
414
|
- lib/logstash/patches/profile_require_calls.rb
|
421
415
|
- lib/logstash/patches/puma.rb
|
422
416
|
- lib/logstash/patches/resolv.rb
|
423
|
-
- lib/logstash/patches/resolv_9270.rb
|
424
417
|
- lib/logstash/patches/stronger_openssl_defaults.rb
|
425
418
|
- lib/logstash/pipeline.rb
|
426
419
|
- lib/logstash/pipeline_action.rb
|
@@ -430,7 +423,6 @@ files:
|
|
430
423
|
- lib/logstash/pipeline_action/stop.rb
|
431
424
|
- lib/logstash/pipeline_reporter.rb
|
432
425
|
- lib/logstash/pipeline_settings.rb
|
433
|
-
- lib/logstash/pipelines_registry.rb
|
434
426
|
- lib/logstash/plugin.rb
|
435
427
|
- lib/logstash/plugins.rb
|
436
428
|
- lib/logstash/plugins/builtin.rb
|
@@ -455,7 +447,6 @@ files:
|
|
455
447
|
- lib/logstash/util/duration_formatter.rb
|
456
448
|
- lib/logstash/util/filetools.rb
|
457
449
|
- lib/logstash/util/java_version.rb
|
458
|
-
- lib/logstash/util/lazy_singleton.rb
|
459
450
|
- lib/logstash/util/loggable.rb
|
460
451
|
- lib/logstash/util/manticore_ssl_config_helper.rb
|
461
452
|
- lib/logstash/util/modules_setting_array.rb
|
@@ -528,7 +519,6 @@ files:
|
|
528
519
|
- spec/logstash/java_filter_delegator_spec.rb
|
529
520
|
- spec/logstash/java_integration_spec.rb
|
530
521
|
- spec/logstash/java_pipeline_spec.rb
|
531
|
-
- spec/logstash/jruby_version_spec.rb
|
532
522
|
- spec/logstash/json_spec.rb
|
533
523
|
- spec/logstash/legacy_ruby_event_spec.rb
|
534
524
|
- spec/logstash/legacy_ruby_timestamp_spec.rb
|
@@ -546,7 +536,6 @@ files:
|
|
546
536
|
- spec/logstash/pipeline_pq_file_spec.rb
|
547
537
|
- spec/logstash/pipeline_reporter_spec.rb
|
548
538
|
- spec/logstash/pipeline_spec.rb
|
549
|
-
- spec/logstash/pipelines_registry_spec.rb
|
550
539
|
- spec/logstash/plugin_spec.rb
|
551
540
|
- spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
|
552
541
|
- spec/logstash/plugins/hooks_registry_spec.rb
|
@@ -593,7 +582,7 @@ files:
|
|
593
582
|
- versions-gem-copy.yml
|
594
583
|
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
595
584
|
licenses:
|
596
|
-
- Apache
|
585
|
+
- Apache-2.0
|
597
586
|
metadata: {}
|
598
587
|
post_install_message:
|
599
588
|
rdoc_options: []
|
@@ -606,12 +595,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
606
595
|
version: '0'
|
607
596
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
608
597
|
requirements:
|
609
|
-
- - "
|
598
|
+
- - ">"
|
610
599
|
- !ruby/object:Gem::Version
|
611
|
-
version:
|
600
|
+
version: 1.3.1
|
612
601
|
requirements: []
|
613
602
|
rubyforge_project:
|
614
|
-
rubygems_version: 2.
|
603
|
+
rubygems_version: 2.6.13
|
615
604
|
signing_key:
|
616
605
|
specification_version: 4
|
617
606
|
summary: logstash-core - The core components of logstash
|
@@ -669,7 +658,6 @@ test_files:
|
|
669
658
|
- spec/logstash/java_filter_delegator_spec.rb
|
670
659
|
- spec/logstash/java_integration_spec.rb
|
671
660
|
- spec/logstash/java_pipeline_spec.rb
|
672
|
-
- spec/logstash/jruby_version_spec.rb
|
673
661
|
- spec/logstash/json_spec.rb
|
674
662
|
- spec/logstash/legacy_ruby_event_spec.rb
|
675
663
|
- spec/logstash/legacy_ruby_timestamp_spec.rb
|
@@ -687,7 +675,6 @@ test_files:
|
|
687
675
|
- spec/logstash/pipeline_pq_file_spec.rb
|
688
676
|
- spec/logstash/pipeline_reporter_spec.rb
|
689
677
|
- spec/logstash/pipeline_spec.rb
|
690
|
-
- spec/logstash/pipelines_registry_spec.rb
|
691
678
|
- spec/logstash/plugin_spec.rb
|
692
679
|
- spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
|
693
680
|
- spec/logstash/plugins/hooks_registry_spec.rb
|