openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Correct metrics_qdr logging path and regex parsing" into stable/ussuri

This commit is contained in:
Zuul 2021-06-05 12:10:21 +00:00 committed by Gerrit Code Review
parent c09a94d81d ad5ab191e4
commit 23846f1496
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/metrics/qdr-container-puppet.yaml
View File

@ -43,8 +43,8 @@ parameters:
type: json type: json
default: default:
tag: openstack.nova.consoleauth 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: MetricsQdrPort:
default: 5666 default: 5666
description: Service name or port number on which the qdrouterd will accept description: Service name or port number on which the qdrouterd will accept

2
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

@ -95,7 +95,7 @@ parameters:
type: json type: json
default: default:
tag: system.pacemaker 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}" startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}"
ContainerCli: ContainerCli:
type: string type: string