Merge pull request #99 from fabric-testbed/minor_fixes

Minor fixes

instrumentize/elk/fabric-rack/roles/filebeat/tasks/install_beats.yml

@@ -13,14 +13,16 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   loop:
-    - { src: "docker-compose.yml", dest: "/opt/beats/" }
     - { src: "{{ '../../files/' + hostvars[inventory_hostname]['intermediate_certificate_name'] }}", dest: "/opt/beats/" }
 
 - name: Copy Filebeat template file
   become: true
   template:
-    src: filebeat.yml.j2
-    dest: /opt/beats/filebeat-docker.yml
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - { src: "filebeat.yml.j2", dest: "/opt/beats/filebeat-docker.yml" }
+    - { src: "docker-compose.yml.j2", dest: "/opt/beats/docker-compose.yml" }
 
 - name: Start Filebeat
   community.docker.docker_compose:

instrumentize/elk/fabric-rack/roles/filebeat/templates/docker-compose.yml.j2

@@ -0,0 +1,40 @@
+version: "3.6"
+
+services:
+  filebeat:
+    image: docker.elastic.co/beats/filebeat:8.6.1
+    network_mode: host
+    restart: always
+    container_name: fabric_beats_filebeat
+    user: root
+    command: -strict.perms=false -e
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1024m"
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "/var/lib/docker/containers/:/var/lib/docker/containers/:ro"
+{% if component_type != 'head' and component_type != 'worker' %}
+{% for collector in logs_collection %}
+{% if hostname in collector.hosts and "/home/nrig-service/ControlFramework/fabric_cf" not in collector.log_path %}
+      - "{{ collector.log_path|dirname+'/:'+collector.log_path|dirname+'/' }}"
+{% endif %}
+{% endfor %}
+{% else %}
+      - "/var/log/:/var/log/:ro"
+      - "/opt/data/zeek/logs:/opt/zeek/logs"
+      - "/opt/data/zeek/spool:/opt/zeek/spool"
+      - "/home/nrig-service/ControlFramework/fabric_cf/:/home/nrig-service/ControlFramework/fabric_cf/"
+{% endif %}
+    secrets:
+      - source: filebeat.yml
+        target: /usr/share/filebeat/filebeat.yml
+      - source: mfbr1-p_fabric-testbed_net_interm.cer
+        target: /etc/filebeat/mfbr1-p_fabric-testbed_net_interm.cer
+
+secrets:
+  filebeat.yml:
+    file: ./filebeat-docker.yml
+  mfbr1-p_fabric-testbed_net_interm.cer:
+    file: ./mfbr1-p_fabric-testbed_net_interm.cer

instrumentize/elk/fabric-rack/roles/filebeat/templates/filebeat.yml.j2

@@ -111,9 +111,23 @@ filebeat.modules:
 setup.template.settings:
   index.number_of_shards: 1
 
+{% if component_type == 'head' or component_type == 'worker' %}
+
 #-------------- Logstash Output ---------------
 output.logstash:
   hosts: ["192.168.{{ hank_id }}.10:5044"]
+{% else %}
+# -------------------------------- Kafka Output --------------------------------
+output.kafka:
+  enabled: true
+  hosts: {{ hostvars[inventory_hostname]['mfkfk_hosts'] }}
+  topic: "{{ hostvars[inventory_hostname]['mfkfk_topic_name'] }}"
+  username: "{{ hostvars[inventory_hostname]['mfkfk_username'] }}"
+  password: "{{ hostvars[inventory_hostname]['mfkfk_password'] }}"
+  sasl.mechanism: SCRAM-SHA-256
+  ssl.verification_mode: certificate
+  ssl.certificate_authorities: {{ hostvars[inventory_hostname]['ssl']['certificate_authorities'] }}
+{% endif%}
 
 processors:
   - add_host_metadata: