Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
Replace deprecated settings (#124)
Browse files Browse the repository at this point in the history
In keeping with the changes made in elastic/logstash#10380.
  • Loading branch information
ycombinator committed Feb 8, 2019
1 parent 43bcd2b commit e248306
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/logstash/config/logstash-full.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
http.host: "0.0.0.0"
xpack.monitoring.elasticsearch.url: http://elasticsearch:9200
xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ]
8 changes: 4 additions & 4 deletions build/logstash/env2yaml/env2yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,21 @@ func normalizeSetting(setting string) (string, error) {
"path.plugins",
"xpack.monitoring.enabled",
"xpack.monitoring.collection.interval",
"xpack.monitoring.elasticsearch.url",
"xpack.monitoring.elasticsearch.hosts",
"xpack.monitoring.elasticsearch.username",
"xpack.monitoring.elasticsearch.password",
"xpack.monitoring.elasticsearch.ssl.ca",
"xpack.monitoring.elasticsearch.ssl.certificate_authority",
"xpack.monitoring.elasticsearch.ssl.truststore.path",
"xpack.monitoring.elasticsearch.ssl.truststore.password",
"xpack.monitoring.elasticsearch.ssl.keystore.path",
"xpack.monitoring.elasticsearch.ssl.keystore.password",
"xpack.management.enabled",
"xpack.management.logstash.poll_interval",
"xpack.management.pipeline.id",
"xpack.management.elasticsearch.url",
"xpack.management.elasticsearch.hosts",
"xpack.management.elasticsearch.username",
"xpack.management.elasticsearch.password",
"xpack.management.elasticsearch.ssl.ca",
"xpack.management.elasticsearch.ssl.certificate_authority",
"xpack.management.elasticsearch.ssl.truststore.path",
"xpack.management.elasticsearch.ssl.truststore.password",
"xpack.management.elasticsearch.ssl.keystore.path",
Expand Down
4 changes: 2 additions & 2 deletions tests/test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def test_disabling_java_execution_via_environment(logstash):

def test_setting_elasticsearch_urls_as_an_array(logstash):
setting_string = '["http://node1:9200","http://node2:9200"]'
logstash.restart(args='-e xpack.monitoring.elasticsearch.url=%s' % setting_string)
live_setting = logstash.get_settings()['xpack.monitoring.elasticsearch.url']
logstash.restart(args='-e xpack.monitoring.elasticsearch.hosts=%s' % setting_string)
live_setting = logstash.get_settings()['xpack.monitoring.elasticsearch.hosts']
assert type(live_setting) is list
assert 'http://node1:9200' in live_setting
assert 'http://node2:9200' in live_setting
Expand Down

0 comments on commit e248306

Please sign in to comment.