From d6c0fc961394d939560d901e23ab8ac6ec2cb77d Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 23 Jul 2018 11:53:31 -0500 Subject: [PATCH] Add x-pack monitoring by default This change adds xpack monitoring by default for kibana, logstash, and elasticsearch. Change-Id: I03c8b8390d33bb996201671aae481415bfc1e691 Signed-off-by: Kevin Carter --- elk_metrics_6x/installCurator.yml | 2 +- elk_metrics_6x/templates/elasticsearch.yml.j2 | 6 ++++++ elk_metrics_6x/templates/kibana.yml.j2 | 11 +++++++++++ elk_metrics_6x/templates/logstash.yml.j2 | 8 ++++---- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/elk_metrics_6x/installCurator.yml b/elk_metrics_6x/installCurator.yml index 94535bf8..7e1ee962 100644 --- a/elk_metrics_6x/installCurator.yml +++ b/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 diff --git a/elk_metrics_6x/templates/elasticsearch.yml.j2 b/elk_metrics_6x/templates/elasticsearch.yml.j2 index b98e01a8..52724adb 100644 --- a/elk_metrics_6x/templates/elasticsearch.yml.j2 +++ b/elk_metrics_6x/templates/elasticsearch.yml.j2 @@ -114,3 +114,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 diff --git a/elk_metrics_6x/templates/kibana.yml.j2 b/elk_metrics_6x/templates/kibana.yml.j2 index 2b8d3ff8..dc8e592a 100644 --- a/elk_metrics_6x/templates/kibana.yml.j2 +++ b/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 diff --git a/elk_metrics_6x/templates/logstash.yml.j2 b/elk_metrics_6x/templates/logstash.yml.j2 index b0c007a2..4a15be74 100644 --- a/elk_metrics_6x/templates/logstash.yml.j2 +++ b/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