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

Implement review suggestions

Browse source 
Fixes #10561
This commit is contained in:
Mike Place 2019-03-18 14:31:48 -06:00 • committed by Shaunak Kashyap
parent d4a915be2b
commit 4e5321a79a
4 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/lib/logstash/lir_serializer.rb → logstash-core/lib/logstash/config/lir_serializer.rb
View file

@ -3,6 +3,7 @@ require 'logstash-core'
require 'logstash/compiler'
module LogStash;
module Config;
class LIRSerializer
attr_reader :lir_pipeline
@ -121,4 +122,5 @@ module LogStash;
end
end
end
end

4
logstash-core/lib/logstash/java_pipeline.rb
View file

@ -6,7 +6,7 @@ require "logstash/inputs/base"
require "logstash/outputs/base"
require "logstash/instrument/collector"
require "logstash/compiler"
require "logstash/lir_serializer"
require "logstash/config/lir_serializer"
module LogStash; class JavaPipeline < JavaBasePipeline
include LogStash::Util::Loggable
@ -219,7 +219,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
config_metric.gauge(:dead_letter_queue_path, dlq_writer.get_path.to_absolute_path.to_s) if dlq_enabled?
config_metric.gauge(:ephemeral_id, ephemeral_id)
config_metric.gauge(:hash, lir.unique_hash)
config_metric.gauge(:graph, ::LogStash::LIRSerializer.serialize(lir))
config_metric.gauge(:graph, ::LogStash::Config::LIRSerializer.serialize(lir))
@logger.info("Starting pipeline", default_logging_keys(
"pipeline.workers" => pipeline_workers,

21
x-pack/lib/monitoring/inputs/metrics/state_event/lir_serializer.rb
View file

@ -1,21 +0,0 @@
# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
# or more contributor license agreements. Licensed under the Elastic License;
# you may not use this file except in compliance with the Elastic License.
#
require 'monitoring/inputs/metrics'
require 'logstash-core'
require 'logstash/compiler'
require 'logstash/lir_serializer'
module LogStash; module Inputs; class Metrics; class StateEvent;
class XPackLIRSerializer < LIRSerializer
attr_reader :lir_pipeline
def self.serialize(lir_pipeline)
self.new(lir_pipeline).serialize
end
def initialize(lir_pipeline)
@lir_pipeline = lir_pipeline
end
end; end; end; end; end;

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

@ -4,7 +4,8 @@
#
module LogStash; module Inputs; class Metrics;
class StateEventFactory
require "monitoring/inputs/metrics/state_event/lir_serializer"
# require "monitoring/inputs/metrics/state_event/lir_serializer"
require "logstash/config/lir_serializer"
def initialize(pipeline)
raise ArgumentError, "No pipeline passed in!" unless pipeline.is_a?(LogStash::Pipeline) || pipeline.is_a?(LogStash::JavaPipeline)
@event = LogStash::Event.new
@ -29,7 +30,7 @@ module LogStash; module Inputs; class Metrics;
"ephemeral_id" => pipeline.ephemeral_id,
"workers" => pipeline.settings.get("pipeline.workers"),
"batch_size" => pipeline.settings.get("pipeline.batch.size"),
"representation" => ::LogStash::Inputs::Metrics::StateEvent::XPackLIRSerializer.serialize(pipeline.lir)
"representation" => ::LogStash::Config::LIRSerializer.serialize(pipeline.lir)
}
end