Merge "Correct metrics_qdr logging path and regex parsing"

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:

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
+      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]+\\) "
+      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

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