From dc43a27d4a196b74d440577d3e70b56dd037d15e Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 16 May 2018 11:18:33 +0100 Subject: [PATCH] Allow deploy time env vars when deploying ELK stack Change-Id: I029b2a88c4f04f9d2a67763a35db9e52a672fc8a --- elk_metrics_6x/installAPMserver.yml | 3 ++- elk_metrics_6x/installAuditbeat.yml | 2 ++ elk_metrics_6x/installCurator.yml | 2 ++ elk_metrics_6x/installElastic.yml | 4 ++++ elk_metrics_6x/installFilebeat.yml | 2 ++ elk_metrics_6x/installHeartbeat.yml | 2 ++ elk_metrics_6x/installJournalbeat.yml | 2 ++ elk_metrics_6x/installKibana.yml | 3 +++ elk_metrics_6x/installLogstash.yml | 3 +++ elk_metrics_6x/installMetricbeat.yml | 2 ++ elk_metrics_6x/installPacketbeat.yml | 2 ++ 11 files changed, 26 insertions(+), 1 deletion(-) diff --git a/elk_metrics_6x/installAPMserver.yml b/elk_metrics_6x/installAPMserver.yml index bf68836f..9e2f96f4 100644 --- a/elk_metrics_6x/installAPMserver.yml +++ b/elk_metrics_6x/installAPMserver.yml @@ -8,6 +8,8 @@ vars_files: - vars/variables.yml + environment: "{{ deployment_environment_variables | default({}) }}" + pre_tasks: - include_tasks: common_task_install_elk_repo.yml @@ -38,7 +40,6 @@ enabled: true state: restarted - - name: Load apm-server Dashboards hosts: apm-server[0] become: true diff --git a/elk_metrics_6x/installAuditbeat.yml b/elk_metrics_6x/installAuditbeat.yml index 21094d88..a76e6b0c 100644 --- a/elk_metrics_6x/installAuditbeat.yml +++ b/elk_metrics_6x/installAuditbeat.yml @@ -8,6 +8,8 @@ vars_files: - vars/variables.yml + environment: "{{ deployment_environment_variables | default({}) }}" + pre_tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installCurator.yml b/elk_metrics_6x/installCurator.yml index e81b82c8..1b2a4140 100644 --- a/elk_metrics_6x/installCurator.yml +++ b/elk_metrics_6x/installCurator.yml @@ -22,6 +22,8 @@ vars_files: - vars/variables.yml + environment: "{{ deployment_environment_variables | default({}) }}" + pre_tasks: - name: Ensure curator is installed pip: diff --git a/elk_metrics_6x/installElastic.yml b/elk_metrics_6x/installElastic.yml index 785fa380..221c1cc3 100644 --- a/elk_metrics_6x/installElastic.yml +++ b/elk_metrics_6x/installElastic.yml @@ -2,8 +2,12 @@ - name: Install Elastic Search hosts: "elastic-logstash" become: true + vars_files: - vars/variables.yml + + environment: "{{ deployment_environment_variables | default({}) }}" + tasks: - name: Set half memory fact set_fact: diff --git a/elk_metrics_6x/installFilebeat.yml b/elk_metrics_6x/installFilebeat.yml index fe5b7d5b..7d691cb5 100644 --- a/elk_metrics_6x/installFilebeat.yml +++ b/elk_metrics_6x/installFilebeat.yml @@ -8,6 +8,8 @@ vars_files: - vars/variables.yml + environment: "{{ deployment_environment_variables | default({}) }}" + pre_tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installHeartbeat.yml b/elk_metrics_6x/installHeartbeat.yml index 21962404..63e2b8f3 100644 --- a/elk_metrics_6x/installHeartbeat.yml +++ b/elk_metrics_6x/installHeartbeat.yml @@ -8,6 +8,8 @@ vars_files: - vars/variables.yml + environment: "{{ deployment_environment_variables | default({}) }}" + pre_tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installJournalbeat.yml b/elk_metrics_6x/installJournalbeat.yml index 68125ad9..0ace3a02 100644 --- a/elk_metrics_6x/installJournalbeat.yml +++ b/elk_metrics_6x/installJournalbeat.yml @@ -22,6 +22,8 @@ vars_files: - vars/variables.yml + environment: "{{ deployment_environment_variables | default({}) }}" + pre_tasks: - include_tasks: common_task_install_go1.10.1.yml diff --git a/elk_metrics_6x/installKibana.yml b/elk_metrics_6x/installKibana.yml index 3e00a426..50685caa 100644 --- a/elk_metrics_6x/installKibana.yml +++ b/elk_metrics_6x/installKibana.yml @@ -4,6 +4,9 @@ become: true vars_files: - vars/variables.yml + + environment: "{{ deployment_environment_variables | default({}) }}" + tasks: - include_tasks: common_task_install_elk_repo.yml diff --git a/elk_metrics_6x/installLogstash.yml b/elk_metrics_6x/installLogstash.yml index 9edb925f..509a4815 100644 --- a/elk_metrics_6x/installLogstash.yml +++ b/elk_metrics_6x/installLogstash.yml @@ -4,6 +4,9 @@ become: true vars_files: - vars/variables.yml + + environment: "{{ deployment_environment_variables | default({}) }}" + tasks: - name: Set quarter memory fact set_fact: diff --git a/elk_metrics_6x/installMetricbeat.yml b/elk_metrics_6x/installMetricbeat.yml index f468415a..67e8f911 100644 --- a/elk_metrics_6x/installMetricbeat.yml +++ b/elk_metrics_6x/installMetricbeat.yml @@ -5,6 +5,8 @@ vars: haproxy_ssl: false + environment: "{{ deployment_environment_variables | default({}) }}" + vars_files: - vars/variables.yml diff --git a/elk_metrics_6x/installPacketbeat.yml b/elk_metrics_6x/installPacketbeat.yml index 52925fb4..eada99e1 100644 --- a/elk_metrics_6x/installPacketbeat.yml +++ b/elk_metrics_6x/installPacketbeat.yml @@ -5,6 +5,8 @@ vars: haproxy_ssl: false + environment: "{{ deployment_environment_variables | default({}) }}" + vars_files: - vars/variables.yml