From cda21df470cb801608fa7cf625100e754bc8e161 Mon Sep 17 00:00:00 2001
From: pleimer <pleimer@redhat.com>
Date: Mon, 12 Apr 2021 14:54:31 -0400
Subject: [PATCH] Correct metrics_qdr logging path and regex parsing

Change-Id: I98c1b7b21f9d5bd6e0f91ed7b1df74d01ab2b592
Resolves: rhbz#1945075
---
 deployment/metrics/qdr-container-ansible.yaml        | 4 ++--
 deployment/metrics/qdr-container-puppet.yaml         | 4 ++--
 deployment/pacemaker/pacemaker-baremetal-puppet.yaml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deployment/metrics/qdr-container-ansible.yaml b/deployment/metrics/qdr-container-ansible.yaml
index b4e622f683..67ec5db58c 100644
--- a/deployment/metrics/qdr-container-ansible.yaml
+++ b/deployment/metrics/qdr-container-ansible.yaml
@@ -52,9 +52,9 @@ parameters:
     type: boolean
   MetricsQdrLoggingSource:
     default:
-      file: /var/log/containers/qdrouterd/metrics_qdr.log
+      file: /var/log/containers/metrics_qdr/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]+\) '
+        \\+[0-9]+)? [A-Z]+ \\([a-z]+\\) '
       tag: openstack.nova.consoleauth
     type: json
   MetricsQdrPassword:
diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml
index b4f2418c8d..794b70ea8c 100644
--- a/deployment/metrics/qdr-container-puppet.yaml
+++ b/deployment/metrics/qdr-container-puppet.yaml
@@ -40,8 +40,8 @@ parameters:
     type: json
     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]+\\) "
+      file: /var/log/containers/metrics_qdr/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 3acdd0f287..0ffb4e38b3 100644
--- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
+++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml
@@ -92,7 +92,7 @@ parameters:
     type: json
     default:
       tag: system.pacemaker
-      file: /var/log/host/pacemaker/pacemaker.log
+      file: /var/log/pacemaker/pacemaker.log
       startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}"
   ContainerCli:
     type: string