Merge "Adds FluentD configuration for OpenvSwitch log matching"

ansible/roles/common/tasks/config.yml

@@ -104,6 +104,8 @@
         enabled: "{{ enable_prometheus_fluentd_integration | bool }}"
       - name: "conf/input/09-monasca.conf.j2"
         enabled: true
+      - name: "conf/input/10-openvswitch.conf.j2"
+        enabled: true
     customised_input_files: "{{ find_custom_fluentd_inputs.files | map(attribute='path') | list }}"
     # Filters
     fluentd_filter_files: "{{ default_filter_files | customise_fluentd(customised_filter_files) }}"

ansible/roles/common/templates/conf/input/10-openvswitch.conf.j2

@@ -0,0 +1,25 @@
+<source>
+  @type tail
+  path /var/log/kolla/openvswitch/ovs-vswitchd.log
+  pos_file /var/run/td-agent/openvswitch.pos
+  tag infra.openvswitch
+  format multiline
+  format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}/
+  format1 /^(?<Timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3})Z\|\d{5,}\|(?<module>\S+)\|(?<log_level>\S+)\|(?<Payload>.*)/
+  time_key Timestamp
+  time_format %FT%T.%L
+  enable_watch_timer false
+</source>
+
+<source>
+  @type tail
+  path /var/log/kolla/openvswitch/ovsdb-server.log
+  pos_file /var/run/td-agent/openvswitchdb.pos
+  tag infra.openvswitchdb
+  format multiline
+  format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}/
+  format1 /^(?<Timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3})Z\|\d{5,}\|(?<module>\S+)\|(?<log_level>\S+)\|(?<Payload>.*)/
+  time_key Timestamp
+  time_format %FT%T.%L
+  enable_watch_timer false
+</source>

releasenotes/notes/bug-1965815-37fc4f82bef7a47e.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Adds Fluentd configurations to allow matching OpenvSwitch logs.
+    `LP#1965815 <https://launchpad.net/bugs/1965815>`__