Merge "Add x-pack monitoring by default"

elk_metrics_6x/installCurator.yml

@@ -36,7 +36,7 @@
         method: GET
       register: elk_data
       until: elk_data is success
-      retries: 3
+      retries: 5
       delay: 5
       run_once: true
 

elk_metrics_6x/templates/elasticsearch.yml.j2

@@ -113,3 +113,9 @@ indices.memory.index_buffer_size: 30%
 # Connection throttling on recovery is limited to 75% of the detected interface
 # speed. This will improce search speeds and reduce general cluster pressure.
 indices.recovery.max_bytes_per_sec: {{ elasticserch_interface_speed }}mb
+
+# ---------------------------------- X-Pack ------------------------------------
+# X-Pack Monitoring
+# https://www.elastic.co/guide/en/elasticsearch/reference/6.3/monitoring-settings.html
+xpack.monitoring.collection.enabled: true
+xpack.monitoring.collection.interval: 30s

elk_metrics_6x/templates/kibana.yml.j2

@@ -79,3 +79,14 @@
 # Set the value of this setting to true to log all events, including system usage information
 # and all requests.
 # logging.verbose: false
+
+# ---------------------------------- X-Pack ------------------------------------
+# X-Pack Monitoring
+# https://www.elastic.co/guide/en/kibana/6.3/monitoring-settings-kb.html
+ xpack.monitoring.enabled: true
+ xpack.xpack_main.telemetry.enabled: false
+ xpack.monitoring.kibana.collection.enabled: true
+ xpack.monitoring.kibana.collection.interval: 30000
+ xpack.monitoring.min_interval_seconds: 30
+ xpack.monitoring.ui.enabled: true
+ xpack.monitoring.ui.container.elasticsearch.enabled: true

elk_metrics_6x/templates/logstash.yml.j2

@@ -212,11 +212,10 @@ path.logs: /var/log/logstash
 # Where to find custom plugins
 # path.plugins: []
 #
-# ------------ X-Pack Settings (not applicable for OSS build)--------------
-#
+# ---------------------------------- X-Pack ------------------------------------
 # X-Pack Monitoring
 # https://www.elastic.co/guide/en/logstash/current/monitoring-logstash.html
-#xpack.monitoring.enabled: false
+xpack.monitoring.enabled: true
 #xpack.monitoring.elasticsearch.username: logstash_system
 #xpack.monitoring.elasticsearch.password: password
 #xpack.monitoring.elasticsearch.url: ["https://es1:9200", "https://es2:9200"]
@@ -227,9 +226,10 @@ path.logs: /var/log/logstash
 #xpack.monitoring.elasticsearch.ssl.keystore.password: password
 #xpack.monitoring.elasticsearch.ssl.verification_mode: certificate
 #xpack.monitoring.elasticsearch.sniffing: false
-#xpack.monitoring.collection.interval: 10s
+xpack.monitoring.collection.interval: 30s
 #xpack.monitoring.collection.pipeline.details.enabled: true
 #
+# ------------ X-Pack Settings (not applicable for OSS build)--------------
 # X-Pack Management
 # https://www.elastic.co/guide/en/logstash/current/logstash-centralized-pipeline-management.html
 #xpack.management.enabled: false