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

Central management typeless API

Browse source 
This commit adopts Elasticsearch's typeless API for central management.

Relates: https://github.com/elastic/elasticsearch/issues/3863

Fixes #10421
This commit is contained in:
Jake Landis 2019-02-08 11:25:21 -06:00 • committed by João Duarte
parent 59e51127af
commit 7ca98d3410
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
x-pack/lib/config_management/elasticsearch_source.rb
View file

@ -20,7 +20,6 @@ module LogStash
class RemoteConfigError < LogStash::Error; end
PIPELINE_INDEX = ".logstash"
PIPELINE_TYPE = "doc"
VALID_LICENSES = %w(trial standard gold platinum)
FEATURE_INTERNAL = 'management'
FEATURE_EXTERNAL = 'logstash'
@ -138,7 +137,7 @@ module LogStash
end
def config_path
"#{PIPELINE_INDEX}/#{PIPELINE_TYPE}/_mget"
"#{PIPELINE_INDEX}/_mget"
end
def populate_license_state(xpack_info)

4
x-pack/spec/config_management/elasticsearch_source_spec.rb
View file

@ -132,7 +132,7 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
} }
it "generates the path to get the configuration" do
expect(subject.config_path).to eq("#{described_class::PIPELINE_INDEX}/#{described_class::PIPELINE_TYPE}/_mget")
expect(subject.config_path).to eq("#{described_class::PIPELINE_INDEX}/_mget")
end
end
@ -168,7 +168,7 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
let(:pipeline_id) { "apache" }
let(:mock_client) { double("http_client") }
let(:settings) { super.merge({ "xpack.management.pipeline.id" => pipeline_id }) }
let(:es_path) { "#{described_class::PIPELINE_INDEX}/#{described_class::PIPELINE_TYPE}/_mget" }
let(:es_path) { "#{described_class::PIPELINE_INDEX}/_mget" }
let(:request_body_string) { LogStash::Json.dump({ "docs" => [{ "_id" => pipeline_id }] }) }
before do