diff --git a/build/logstash/config/logstash.yml b/build/logstash/config/logstash.yml index 91bc0fa54ef20eebb5b1a45ce6d0e9b20102d1f8..2a5d4d762c62b609e6737c2cdfda187881b75444 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 59cf8c6088852ccc1959f28796ea3c3b12782a40..75c39a032bc5137da08f841f3491cbc4d03d356f 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 802c2827843c76988f420e880d37a78e78b619dd..9b87d10c91f295ec71f50cf8c9938ceafdcf893c 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')