From 151d80382cfe31dc114de87dd39cecc47ec33f98 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Sun, 27 Jan 2019 01:25:05 -0600 Subject: [PATCH] Omit dahsboard on elk setup by default With the introduction of the "infrustructure" panel and "canvas" becoming stable, there's not a lot of reason to import the general beat dashboards. The default dashboard are almost always in a state of disrepare and take a long time to import on high traffic clusters. This channge removes the default dashboard from the beat setup role by default. If a deployer wishes to renable the default dashboards, or add any other beat flags, the variable `elastic_setup_flags` can be used to extend the setup. Change-Id: If44845f53e4d0cb1e91ec804060316fb852b4bfa Signed-off-by: Kevin Carter --- elk_metrics_6x/fieldRefresh.yml | 8 ++++++++ elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml | 2 +- overlay-inventories/osa-integration-inventory.yml | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/elk_metrics_6x/fieldRefresh.yml b/elk_metrics_6x/fieldRefresh.yml index fe009e5c..de64c886 100644 --- a/elk_metrics_6x/fieldRefresh.yml +++ b/elk_metrics_6x/fieldRefresh.yml @@ -88,6 +88,14 @@ retries: 6 delay: 30 run_once: true + rescue: + - name: Notify deployer + debug: + msg: >- + Index pattern refresh was not possible at this time. Either there are no dashboards + loaded or the index being refreshed does not exist. While the task failed, this is + not a fatal error, so the play has been rescued. + run_once: true when: - index_fields_return.status == 200 - index_fields_format_return.status == 200 diff --git a/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml b/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml index eb4bb352..da5eccb3 100644 --- a/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml +++ b/elk_metrics_6x/roles/elastic_beat_setup/defaults/main.yml @@ -18,7 +18,7 @@ elastic_setup_flags: - "--template" - "--pipelines" - "--machine-learning" - - "--dashboards" + # - "--dashboards" # Setup options are cast as a string with, one option per line. elastic_beat_setup_options: >- diff --git a/overlay-inventories/osa-integration-inventory.yml b/overlay-inventories/osa-integration-inventory.yml index 6149acd3..987a7e96 100644 --- a/overlay-inventories/osa-integration-inventory.yml +++ b/overlay-inventories/osa-integration-inventory.yml @@ -111,6 +111,10 @@ all_systems: vars: elastic_skydive_retention: 2 # Elastic retention set to 2 days max elastic_skydive_size: 51200 # Elastic retention set to 50GiB max + elastic_setup_flags: + - "--template" + - "--pipelines" + - "--machine-learning" children: elastic-logstash_all: children: