github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-23 22:27:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix filter 'id' naming to be consistent with inputs / outputs

Browse source 
The filters were the only category prefixing IDs with their plugin names

Fixes #6259
This commit is contained in:
Andrew Cholakian 2016-11-15 17:06:16 -06:00
parent 81e8bda0b9
commit c03f30fedb
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/lib/logstash/filter_delegator.rb
View file

@ -20,7 +20,7 @@ module LogStash
@filter = klass.new(plugin_args)
# Scope the metrics to the plugin
namespaced_metric = metric.namespace("#{@klass.config_name}_#{@id}".to_sym)
namespaced_metric = metric.namespace(@id.to_sym)
@filter.metric = namespaced_metric
@metric_events = namespaced_metric.namespace(:events)

4
logstash-core/spec/logstash/pipeline_spec.rb
View file

@ -685,7 +685,7 @@ describe LogStash::Pipeline do
it "populates the filter metrics" do
[multiline_id, multiline_id_other].map(&:to_sym).each do |id|
[:in, :out].each do |metric_key|
plugin_name = "multiline_#{id}".to_sym
plugin_name = id.to_sym
expect(collected_metric[:stats][:pipelines][:main][:plugins][:filters][plugin_name][:events][metric_key].value).to eq(number_of_events)
end
end
@ -703,7 +703,7 @@ describe LogStash::Pipeline do
it "populates the name of the filter plugin" do
[multiline_id, multiline_id_other].map(&:to_sym).each do |id|
plugin_name = "multiline_#{id}".to_sym
plugin_name = id.to_sym
expect(collected_metric[:stats][:pipelines][:main][:plugins][:filters][plugin_name][:name].value).to eq(LogStash::Filters::Multiline.config_name)
end
end