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

PQ/DLQ Monitoring: Fix X-Pack and multi-pipeline monitoring

Browse source 
When X-Pack is installed an internal (hidden) pipeline named .monitoring-logstash is also running. This means that for X-Pack is there N +1 pipelines where N = user defined pipelines. The code currently only supports monitoring 1 pipeline, and it is possible that the internal pipeline gets picked up instead of the intended pipeline.

When multiple user pipelines are enabled (6.0+), the code still only supports monitoring 1 pipeline.

The change here is to ignore the system pipelines, and monitor as many user defined pipelines that may exist.

Fixes: #8382

Fixes #8472
This commit is contained in:
Jake Landis 2017-10-10 16:47:06 -05:00
parent 1f1e2ffbfa
commit 1b291247e5
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
logstash-core/lib/logstash/instrument/periodic_poller/dlq.rb
View file

@ -10,10 +10,15 @@ module LogStash module Instrument module PeriodicPoller
end
def collect
_, pipeline = @agent.with_running_pipelines { |pipelines| pipelines.first }
unless pipeline.nil?
pipeline.collect_dlq_stats
pipelines = @agent.with_running_user_defined_pipelines {|pipelines| pipelines}
unless pipelines.nil?
pipelines.each {|_, pipeline|
unless pipeline.nil?
pipeline.collect_dlq_stats
end
}
end
end
end
end end end

10
logstash-core/lib/logstash/instrument/periodic_poller/pq.rb
View file

@ -11,9 +11,13 @@ module LogStash module Instrument module PeriodicPoller
end
def collect
pipeline_id, pipeline = @agent.with_running_pipelines {|pipelines| pipelines.first }
unless pipeline.nil?
pipeline.collect_stats
pipelines = @agent.with_running_user_defined_pipelines {|pipelines| pipelines}
unless pipelines.nil?
pipelines.each {|_, pipeline|
unless pipeline.nil?
pipeline.collect_stats
end
}
end
end
end