Merge "Fluentd: Libvirt logs are missing"

ansible/roles/common/tasks/config.yml

@@ -34,6 +34,7 @@
     - "02-mariadb"
     - "03-rabbitmq"
     - "04-openstack-wsgi"
+    - "05-libvirt"
   notify:
     - Restart fluentd container
 

ansible/roles/common/templates/conf/input/05-libvirt.conf.j2

@@ -0,0 +1,10 @@
+{% set fluentd_dir = 'td-agent' if kolla_base_distro in ['ubuntu', 'debian'] else 'fluentd' %}
+<source>
+  @type tail
+  path /var/log/kolla/libvirt/libvirtd.log
+  pos_file /var/run/{{ fluentd_dir }}/libvirt.pos
+  tag infra.libvirt
+  format /^(?<Timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\+\d{4}): (?<Pid>\d+): (?<log_level>\S+) : (?<Payload>.*)?$/
+  time_key Timestamp
+  time_format %F %T.%L%z
+</source>

ansible/roles/common/templates/fluentd.json.j2

@@ -41,6 +41,12 @@
             "owner": "{{ fluentd_user }}",
             "perm": "0600"
         },
+        {
+            "source": "{{ container_config_directory }}/input/05-libvirt.conf",
+            "dest": "{{ fluentd_dir }}/input/05-libvirt.conf",
+            "owner": "{{ fluentd_user }}",
+            "perm": "0600"
+        },
         {
             "source": "{{ container_config_directory }}/filter/00-record_transformer.conf",
             "dest": "{{ fluentd_dir }}/filter/00-record_transformer.conf",