Merge "Allow user override of beat install locations"

elk_metrics_7x/installAuditbeat.yml

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 - name: Install Auditbeat
-  hosts: hosts
+  hosts: "{{ groups['auditbeat'] | default(groups['hosts']) }}"
   become: true
   vars:
     haproxy_ssl: false

elk_metrics_7x/installFilebeat.yml

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 - name: Install Filebeat
-  hosts: hosts
+  hosts: "{{ groups['filebeat'] | default(groups['hosts']) }}"
   become: true
   vars:
     haproxy_ssl: false

elk_metrics_7x/installHeartbeat.yml

@@ -16,17 +16,20 @@
   gather_facts: false
   connection: local
   tasks:
+    - name: Configure deployment group when Heartbeat group not specified
+      block:
         - name: Add hosts to dynamic inventory group
           group_by:
-        key: heatbeat_deployment_targets
+            key: heartbeat_deployment_targets
             parents: kibana
           when:
             - inventory_hostname in groups['kibana'][:3]
+      when: groups['heartbeat'] is not defined
   tags:
     - always
 
 - name: Install Heartbeat
-  hosts: heatbeat_deployment_targets
+  hosts: "{{ groups['heartbeat'] | default(groups['heartbeat_deployment_targets'] | default([])) }}"
   become: true
   vars:
     haproxy_ssl: false

elk_metrics_7x/installJournalbeat.yml

@@ -16,6 +16,8 @@
   gather_facts: false
   connection: local
   tasks:
+    - name: Configure deployment group when Journalbeat group not specified
+      block:
         - name: Add hosts to dynamic inventory group
           group_by:
             key: journalbeat_deployment_containers
@@ -33,12 +35,13 @@
           when:
             - physical_host is undefined or
               physical_host == inventory_hostname
-
+      when:
+        - groups['journalbeat'] is not defined
   tags:
     - always
 
 - name: Install Journalbeat
-  hosts: all_journalbeat_deployments
+  hosts: "{{ groups['journalbeat'] | default(groups['all_journalbeat_deployments']) }}"
   become: true
   vars:
     haproxy_ssl: false

elk_metrics_7x/installMetricbeat.yml

@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Install Metricsbeat
+- name: Install Metricbeat
-  hosts: all
+  # The nested defaults are required as ansible doesn't short-circuit in its default filter
+  hosts: "{{ groups['metricbeat'] | default( (groups['hosts'] | default([])) + (groups['all_containers'] | default([]))) }}"
   become: true
   vars:
     haproxy_ssl: false

elk_metrics_7x/installPacketbeat.yml

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 - name: Install Packetbeat
-  hosts: hosts
+  hosts: "{{ groups['packetbeat'] | default(groups['hosts']) }}"
   become: true
   vars:
     haproxy_ssl: false