From e821f91b6b5cb84623c662056a23314b239c33ff Mon Sep 17 00:00:00 2001
From: Martin Magr <mmagr@redhat.com>
Date: Thu, 13 Aug 2020 10:49:07 +0200
Subject: [PATCH] Centralized logging minor fixes

This patch contains following fixes to have rsyslog configured properly:

 - Don't use default startmsg.regex for QDR
 - Fixed log path for pacemaker service

Change-Id: I2220ba108296475a49eebdc3ceec27208d201b0d
(cherry picked from commit 34a2b091d2f48e2c5633b3dc2efb361655e36ba2)
---
 deployment/metrics/qdr-container-puppet.yaml         | 1 +
 deployment/pacemaker/pacemaker-baremetal-puppet.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml
index 3414eba4f3..fb3769133f 100644
--- a/deployment/metrics/qdr-container-puppet.yaml
+++ b/deployment/metrics/qdr-container-puppet.yaml
@@ -44,6 +44,7 @@ parameters:
     default:
       tag: openstack.nova.consoleauth
       file: /var/log/containers/qdrouterd/metrics_qdr.log
+      startmsg.regex: "^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.[0-9]+ \\+[0-9]+)? [A-Z]+ \\([a-z]+\\) "
   MetricsQdrPort:
     default: 5666
     description: Service name or port number on which the qdrouterd will accept
diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
index 790f071763..dc25e13d91 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -95,7 +95,7 @@ parameters:
     type: json
     default:
       tag: system.pacemaker
-      file: /var/log/host/pacemaker.log
+      file: /var/log/host/pacemaker/pacemaker.log
       startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}"
   ContainerCli:
     type: string