Browse Source

Merge "Correct metrics_qdr logging path and regex parsing"

changes/12/788212/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
d60dffee44
3 changed files with 5 additions and 5 deletions
  1. +2
    -2
      deployment/metrics/qdr-container-ansible.yaml
  2. +2
    -2
      deployment/metrics/qdr-container-puppet.yaml
  3. +1
    -1
      deployment/pacemaker/pacemaker-baremetal-puppet.yaml

+ 2
- 2
deployment/metrics/qdr-container-ansible.yaml View File

@ -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:


+ 2
- 2
deployment/metrics/qdr-container-puppet.yaml View File

@ -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


+ 1
- 1
deployment/pacemaker/pacemaker-baremetal-puppet.yaml View File

@ -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


Loading…
Cancel
Save