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

Fix hard coded constraint on pipeline name for metrics

Browse source 
Fixes #11777
This commit is contained in:
Rob Bavey 2020-04-12 21:14:29 -04:00 • committed by Robert Bavey
parent a6c92efef4
commit d33195750e
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
x-pack/lib/monitoring/inputs/metrics.rb
View file

@ -211,9 +211,18 @@ module LogStash module Inputs
end end
def extract_cluster_uuids(stats) def extract_cluster_uuids(stats)
result = stats.extract_metrics([:stats, :pipelines, :main, :config], :cluster_uuids) cluster_uuids = []
if result && !result[:cluster_uuids].empty? agent.running_pipelines.each do |pipeline_id, _|
cluster_uuids = result[:cluster_uuids] unless pipeline_id.to_sym == :".monitoring-logstash"
path = [:stats, :pipelines, pipeline_id.to_sym, :config]
found_cluster_uuids = stats.extract_metrics(path, :cluster_uuids)
if found_cluster_uuids && !found_cluster_uuids[:cluster_uuids].empty?
cluster_uuids |= found_cluster_uuids[:cluster_uuids]
end
end
end
unless cluster_uuids.empty?
@logger.info("Found cluster_uuids from elasticsearch output plugins", :cluster_uuids => cluster_uuids) @logger.info("Found cluster_uuids from elasticsearch output plugins", :cluster_uuids => cluster_uuids)
if LogStash::SETTINGS.set?("monitoring.cluster_uuid") if LogStash::SETTINGS.set?("monitoring.cluster_uuid")
@logger.warn("Found monitoring.cluster_uuid setting configured in logstash.yml while using the ones discovered from elasticsearch output plugins, ignoring setting monitoring.cluster_uuid") @logger.warn("Found monitoring.cluster_uuid setting configured in logstash.yml while using the ones discovered from elasticsearch output plugins, ignoring setting monitoring.cluster_uuid")

2
x-pack/lib/monitoring/inputs/timer_task_logger.rb
View file

@ -14,7 +14,7 @@ module LogStash module Inputs
if exception.is_a?(Concurrent::TimeoutError) if exception.is_a?(Concurrent::TimeoutError)
logger.debug("metric shipper took too much time to complete", :exception => exception.class, :message => exception.message) logger.debug("metric shipper took too much time to complete", :exception => exception.class, :message => exception.message)
else else
logger.error("metric shipper exception", :exception => exception.class, :message => exception.message) logger.error("metric shipper exception", :exception => exception.class, :message => exception.message, :backtrace => exception.backtrace)
end end
end end
end end

3
x-pack/qa/integration/monitoring/direct_shipping_spec.rb
View file

@ -3,6 +3,7 @@
# you may not use this file except in compliance with the Elastic License. # you may not use this file except in compliance with the Elastic License.
require_relative "../spec_helper" require_relative "../spec_helper"
require 'securerandom'
describe "Direct shipping" do describe "Direct shipping" do
@ -13,7 +14,7 @@ describe "Direct shipping" do
config = "input { generator { count => 100 } tcp { port => 6000 } } output { null {} }" config = "input { generator { count => 100 } tcp { port => 6000 } } output { null {} }"
@logstash_service = logstash_with_empty_default("bin/logstash -e '#{config}' -w 1", { @logstash_service = logstash_with_empty_default("bin/logstash -e '#{config}' -w 1 --pipeline.id #{SecureRandom.hex(8)}", {
:settings => { :settings => {
"monitoring.enabled" => true, "monitoring.enabled" => true,
"monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"], "monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"],