Rename the handlers

handlers/main.yml

@@ -1,6 +1,9 @@
 ---
 # handlers file for beats
 
-- name: restart {{ beat }}
-  service: name={{ beat }} state=restarted enabled=yes
+- name: restart the service
+  service: 
+    name: "{{ beat_product }}" 
+    state: restarted 
+    enabled: true
   when: start_service and restart_on_change and not beats_started.changed

tasks/beats-config.yml

@@ -47,7 +47,7 @@
     force: true
     owner: root
     group: root
-  notify: restart {{ beat }}
+  notify: restart the service
 
 #Copy templated config file
 - name: Copy Configuration File for {{ beat }}
@@ -58,4 +58,4 @@
     force: true
     owner: root
     group: root
-  notify: restart {{ beat }}
+  notify: restart the service

tasks/beats-debian.yml

@@ -8,7 +8,7 @@
   when: use_repository | bool
   register: beat_install
   until: beat_install is succeeded
-  notify: restart {{ beat }}
+  notify: restart the service
 
 - name: Debian - Ensure python-urllib3, python-openssl, python-pyasn1 & python-pip are installed
   apt:
@@ -63,7 +63,7 @@
   register: beat_install
   until: beat_install is succeeded
   when: use_repository | bool
-  notify: restart {{ beat }}
+  notify: restart the service
 
 - name: Debian - hold {{ beat }} version
   command: apt-mark hold {{ beat }}
@@ -88,4 +88,4 @@
   apt:
     deb: '/tmp/{{ beat }}_{{ beats_version }}_{{ os_arch }}.deb'
   when: not use_repository | bool
-  notify: restart {{ beat }}
+  notify: restart the service

tasks/beats-redhat.yml

@@ -39,7 +39,7 @@
   register: beat_install
   until: beat_install is succeeded
   when: use_repository
-  notify: restart {{ beat }}
+  notify: restart the service
 
 - name: RedHat - lock {{ beat }} version
   shell: >-
@@ -59,4 +59,4 @@
   register: beat_install
   until: beat_install is succeeded
   when: not use_repository
-  notify: restart {{ beat }}
+  notify: restart the service

tasks/beats.yml

@@ -14,7 +14,7 @@
   include_tasks: beats-config.yml
 
 # Make sure the service is started, and restart if necessary
-- name: Start {{ beat }} service
+- name: Start {{ beat_product }} service
   service:
     name: '{{ beat }}'
     state: started

tasks/main.yml

@@ -4,7 +4,13 @@
 - name: check-parameters
   include_tasks: beats-param-check.yml
 
+- set_fact:
+    beat_product: "{{ beat }}"
+
 - name: os-specific vars
   include_vars: '{{ ansible_os_family }}.yml'
 
 - include_tasks: beats.yml
+
+- name: Force all notified handlers to run at this point, not waiting for normal sync points
+  meta: flush_handlers