Remove setting "xpack_monitoring_enabled"

With this commit we remove the setting `xpack_monitoring_enabled` as it has been removed in Elasticsearch master. Relates elastic/elasticsearch#54745
elastic · May 6, 2020 · e6cb617 · e6cb617
1 parent 54f1bd9
commit e6cb617
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/cars/v1/default_distro/templates/config/elasticsearch.yml b/cars/v1/default_distro/templates/config/elasticsearch.yml
@@ -1,6 +1,5 @@
 xpack.license.self_generated.type: {{license_type|default('trial')}}
 
 xpack.ml.enabled: {{xpack_ml_enabled|default('false')}}
-xpack.monitoring.enabled: {{xpack_monitoring_enabled|default('false')}}
 xpack.security.enabled: {{xpack_security_enabled|default('false')}}
 xpack.watcher.enabled: {{xpack_watcher_enabled|default('false')}}
diff --git a/cars/v1/x-pack-monitoring-http.ini b/cars/v1/x-pack-monitoring-http.ini
@@ -6,5 +6,4 @@ type = mixin
 base = default_distro,x_pack/base,x_pack/monitoring
 
 [variables]
-xpack_monitoring_enabled = true
 monitoring_type = http
diff --git a/cars/v1/x-pack-monitoring-local.ini b/cars/v1/x-pack-monitoring-local.ini
@@ -6,6 +6,4 @@ type = mixin
 base = default_distro,x_pack/base,x_pack/monitoring
 
 [variables]
-# just enable monitoring. It uses a local exporter by default (i.e. it uses the current cluster to store monitoring data)
-xpack_monitoring_enabled = true
 monitoring_type = local