github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make sure we correctly setup the pipeline.id in the settings object.

Browse source 
Currently the settings object is passed around and will contains default
values for the pipeline, to make sure the created pipeline use the right
`pipeline.id` we need to make sure that we clone the settings object and
we set the value of `pipeline.id` to the correct pipeline.

Fixes #7572
This commit is contained in:
Pier-Hugues Pellerin 2017-06-29 15:09:41 -04:00
parent 524b92e12b
commit 287dfc4bb6
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
logstash-core/lib/logstash/config/modules_common.rb
View file

@ -36,11 +36,14 @@ module LogStash module Config
specified_and_available_names.each do |module_name|
connect_fail_args = {}
begin
module_settings = settings.clone
module_hash = modules_array.find {|m| m["name"] == module_name}
current_module = plugin_modules.find { |allmodules| allmodules.module_name == module_name }
alt_name = "module-#{module_name}"
pipeline_id = alt_name
module_settings.set("pipeline.id", pipeline_id)
current_module.with_settings(module_hash)
esclient = LogStash::ElasticsearchClient.build(module_hash)
@ -52,7 +55,7 @@ module LogStash module Config
config_string = current_module.config_string
pipelines << {"pipeline_id" => pipeline_id, "alt_name" => alt_name, "config_string" => config_string, "settings" => settings}
pipelines << {"pipeline_id" => pipeline_id, "alt_name" => alt_name, "config_string" => config_string, "settings" => module_settings}
else
connect_fail_args[:module_name] = module_name
connect_fail_args[:hosts] = esclient.host_settings