pull filebeat images during build

Author: sjpb

ansible/fatimage.yml

@@ -77,10 +77,10 @@
         name: opensearch
         tasks_from: install.yml
       become: true
-
-    #   opensearch - containerised, nothing to do
     # slurm_stats - nothing to do
-    # filebeat - containerised - nothing to do
+    - import_role:
+        name: filebeat
+        tasks_from: install.yml
 
     - import_role:
       # can't only run cloudalchemy.node_exporter/tasks/install.yml as needs vars from preflight.yml and triggers service start

ansible/monitoring.yml

@@ -26,19 +26,12 @@
           # Collection currently requires root for all tasks.
           become: true
 
-- name: Setup filebeat
+- name: Deploy filebeat
   hosts: filebeat
   tags: filebeat
   tasks:
     - import_role:
         name: filebeat
-        tasks_from: config.yml
-      tags: config
-
-    - import_role:
-        name: filebeat
-        tasks_from: deploy.yml
-      tags: deploy
 
 - name: Deploy node_exporter
   hosts: node_exporter

ansible/roles/filebeat/tasks/deploy.yml ansible/roles/filebeat/tasks/install.ymlansible/roles/filebeat/tasks/deploy.yml renamed to ansible/roles/filebeat/tasks/install.yml

@@ -4,10 +4,14 @@
     dest: /etc/systemd/system/filebeat.service
     src: filebeat.service.j2
   become: true
-  notify: Restart filebeat container
+  register: _filebeat_unit
 
 - name: Pull container image
   containers.podman.podman_image:
     name: "docker.elastic.co/beats/filebeat-oss"
     tag: "{{ filebeat_version }}"
   become_user: "{{ filebeat_podman_user }}"
+
+- name: Reload filebeat unit file
+  command: systemctl daemon-reload
+  when: _filebeat_unit.changed

ansible/roles/filebeat/tasks/main.yml

@@ -0,0 +1,2 @@
+- import_tasks: install.yml
+- import_tasks: runtime.yml

ansible/roles/filebeat/tasks/post.yml

@@ -27,3 +27,13 @@
       mode: 0600
   notify: Restart filebeat container
   become: true
+
+- name: Flush handlers
+  meta: flush_handlers
+
+- name: Ensure filebeat service state
+  systemd:
+    name: filebeat.service
+    state: started
+    enabled: true
+  become: true