From 7df59fbe762d2422b2107e4f7e4d4af5d833644d Mon Sep 17 00:00:00 2001 From: andsel Date: Wed, 29 Jul 2020 17:24:11 +0200 Subject: [PATCH] Remove settings that was intended to direct ship monitoring data to ES monitoring cluster During the development of PR #11541 to direct ship monitoring data to an monitoring ES cluster without hopping through a production ES cluster, the settings for elasticsearch ouput was cloned into a version without the `xpack` prefix. Since that feature has been removed the settings should also be removed from the Docker image --- docker/data/logstash/env2yaml/env2yaml.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docker/data/logstash/env2yaml/env2yaml.go b/docker/data/logstash/env2yaml/env2yaml.go index 4c4f6882c..b66a39fed 100644 --- a/docker/data/logstash/env2yaml/env2yaml.go +++ b/docker/data/logstash/env2yaml/env2yaml.go @@ -84,16 +84,6 @@ func normalizeSetting(setting string) (string, error) { "modules", "path.logs", "path.plugins", - "monitoring.enabled", - "monitoring.collection.interval", - "monitoring.elasticsearch.hosts", - "monitoring.elasticsearch.username", - "monitoring.elasticsearch.password", - "monitoring.elasticsearch.ssl.certificate_authority", - "monitoring.elasticsearch.ssl.truststore.path", - "monitoring.elasticsearch.ssl.truststore.password", - "monitoring.elasticsearch.ssl.keystore.path", - "monitoring.elasticsearch.ssl.keystore.password", "xpack.monitoring.enabled", "xpack.monitoring.collection.interval", "xpack.monitoring.elasticsearch.hosts",