Merge "Correct metrics_qdr logging path and regex parsing" into stabl…

…e/victoria
openstack-archive · May 4, 2021 · 59d1947 · 59d1947
2 parents 5c9c9fb + 1785dab
commit 59d1947
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml
@@ -43,8 +43,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
@@ -95,7 +95,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