From d3d272011a2e466f2d075b2ebca61bc6b7d5b214 Mon Sep 17 00:00:00 2001 From: Jan Klare Date: Fri, 23 Jun 2017 17:17:46 +0200 Subject: [PATCH] remove xpack config options --- build/logstash/config/logstash.yml | 3 --- build/logstash/env2yaml/env2yaml.go | 8 -------- tests/test_settings.py | 6 ------ 3 files changed, 17 deletions(-) diff --git a/build/logstash/config/logstash.yml b/build/logstash/config/logstash.yml index 91bc0fa..2a5d4d7 100644 --- a/build/logstash/config/logstash.yml +++ b/build/logstash/config/logstash.yml @@ -1,5 +1,2 @@ http.host: "0.0.0.0" path.config: /usr/share/logstash/pipeline -xpack.monitoring.elasticsearch.url: http://elasticsearch:9200 -xpack.monitoring.elasticsearch.username: logstash_system -xpack.monitoring.elasticsearch.password: changeme diff --git a/build/logstash/env2yaml/env2yaml.go b/build/logstash/env2yaml/env2yaml.go index 59cf8c6..75c39a0 100644 --- a/build/logstash/env2yaml/env2yaml.go +++ b/build/logstash/env2yaml/env2yaml.go @@ -99,14 +99,6 @@ func normalizeSetting(setting string) (string, error) { "log.format", "path.logs", "path.plugins", - "xpack.monitoring.enabled", - "xpack.monitoring.collection.interval", - "xpack.monitoring.elasticsearch.url", - "xpack.monitoring.elasticsearch.username", - "xpack.monitoring.elasticsearch.password", - "xpack.monitoring.elasticsearch.ssl.ca", - "xpack.monitoring.elasticsearch.ssl.truststore.path", - "xpack.monitoring.elasticsearch.ssl.truststore.password", } for _, valid_setting := range valid_settings { diff --git a/tests/test_settings.py b/tests/test_settings.py index 802c282..9b87d10 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -31,12 +31,6 @@ def test_setting_things_with_upcased_and_underscored_env_vars(logstash): logstash.restart(args='-e PIPELINE_BATCH_DELAY=24') assert logstash.get_node_info()['pipeline']['batch_delay'] == 24 - -def test_disabling_xpack_monitoring_via_environment(logstash): - logstash.restart(args='-e xpack.monitoring.enabled=false') - assert logstash.get_settings()['xpack.monitoring.enabled'] is False - - def test_invalid_settings_in_environment_are_ignored(logstash): logstash.restart(args='-e cheese.ftw=true') assert not logstash.settings_file.contains('cheese.ftw') -- GitLab