Commit d3d27201 authored by Jan Klare's avatar Jan Klare
Browse files

remove xpack config options

parent 68c034f6
http.host: "0.0.0.0" http.host: "0.0.0.0"
path.config: /usr/share/logstash/pipeline path.config: /usr/share/logstash/pipeline
xpack.monitoring.elasticsearch.url: http://elasticsearch:9200
xpack.monitoring.elasticsearch.username: logstash_system
xpack.monitoring.elasticsearch.password: changeme
...@@ -99,14 +99,6 @@ func normalizeSetting(setting string) (string, error) { ...@@ -99,14 +99,6 @@ func normalizeSetting(setting string) (string, error) {
"log.format", "log.format",
"path.logs", "path.logs",
"path.plugins", "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 { for _, valid_setting := range valid_settings {
......
...@@ -31,12 +31,6 @@ def test_setting_things_with_upcased_and_underscored_env_vars(logstash): ...@@ -31,12 +31,6 @@ def test_setting_things_with_upcased_and_underscored_env_vars(logstash):
logstash.restart(args='-e PIPELINE_BATCH_DELAY=24') logstash.restart(args='-e PIPELINE_BATCH_DELAY=24')
assert logstash.get_node_info()['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): def test_invalid_settings_in_environment_are_ignored(logstash):
logstash.restart(args='-e cheese.ftw=true') logstash.restart(args='-e cheese.ftw=true')
assert not logstash.settings_file.contains('cheese.ftw') assert not logstash.settings_file.contains('cheese.ftw')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment