Merge "Fluentd "progname" field not always generated"

ansible/roles/common/templates/conf/filter/00-record_transformer.conf.j2

@@ -6,3 +6,10 @@
         programname ${tag_parts[5]}
     </record>
 </filter>
+
+<filter infra.*>
+    @type record_transformer
+    <record>
+        programname ${tag_parts[1]}
+    </record>
+</filter>

ansible/roles/common/templates/conf/input/02-mariadb.conf.j2

@@ -3,7 +3,7 @@
   @type tail
   path /var/log/kolla/mariadb/mariadb.log
   pos_file /var/run/{{ fluentd_dir }}/mariadb.pos
-  tag mariadb.*
+  tag infra.mariadb
   format multiline
   format_firstline /^\d{6}/
   format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<severity_label>\S+)\] (?<Payload>.*)/

ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2

@@ -3,7 +3,7 @@
   @type tail
   path /var/log/kolla/rabbitmq/rabbit.log
   pos_file /var/run/{{ fluentd_dir }}/rabbit.pos
-  tag rabbit.*
+  tag infra.rabbitmq
   format multiline
   format_firstline /^\s*$/
   format1 /^=(?<log_level>\w+) REPORT==== (?<Times>[^ ]+) ===\n/