From 4bce67c540a0f913d4dd3a974c6b674cea42d5fe Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@gmail.com>
Date: Fri, 8 Sep 2017 22:10:45 +0200
Subject: [PATCH] Fluentd: fix Mariadb mysqld_safe log not match

The following warning logs appears in fluentd container:

[warn]: pattern not match: "170908 21:34:12 mysqld_safe Starting mysqld daemon with databases from /var/lib/mysql/"

This patch fix it

Change-Id: I9820b8c5fd3456ba9c032fdf326c65632d147e50
Closes-Bug: #1708571
---
 ansible/roles/common/templates/conf/input/02-mariadb.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2 b/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
index 7ec270d33f..329372a4c7 100644
--- a/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
+++ b/ansible/roles/common/templates/conf/input/02-mariadb.conf.j2
@@ -6,7 +6,7 @@
   tag infra.mariadb
   format multiline
   format_firstline /^\d{6}/
-  format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) \[(?<log_level>\S+)\] (?<Payload>.*)/
+  format1 /^(?<time>\d{6} \d{1,2}:\d{1,2}:\d{1,2}) (\[(?<log_level>\S+)\]|mysqld_safe) (?<Payload>.*)/
   time_format %y%m%d %k:%M:%S
   enable_watch_timer false
 </source>