From ab7d4a7ea9f351da38008f788f8b1e04417a124d Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Thu, 2 Dec 2021 12:54:56 -0500 Subject: [PATCH] Missing rsyslog parameters for HAProxy Services need to provide this rsyslog configuration in order for their logs to get ingested by rsyslog for forwarding. Closes-Bug: 1953672 Change-Id: I0da99239275fa7f53f032ca4a85460e6111738b4 (cherry picked from commit c3bb91338627c600d3def901113e995095c2e2b5) (cherry picked from commit d0e0f027548e0f4d97c4431f37204a5e822f1c7d) --- deployment/haproxy/haproxy-container-puppet.yaml | 10 ++++++++++ deployment/haproxy/haproxy-pacemaker-puppet.yaml | 10 ++++++++++ .../bug-1953672-haproxy-rsyslog-6f8e386f8909a253.yaml | 4 ++++ 3 files changed, 24 insertions(+) create mode 100644 releasenotes/notes/bug-1953672-haproxy-rsyslog-6f8e386f8909a253.yaml diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 387e06ee31..2c718e364e 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -36,6 +36,12 @@ parameters: description: User for HAProxy stats endpoint default: admin type: string + HAProxyLoggingSource: + type: json + default: + tag: openstack.haproxy + file: /var/log/containers/haproxy/haproxy.log + startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}" HAProxySyslogAddress: default: /dev/log description: Syslog address where HAproxy will send its log @@ -201,6 +207,10 @@ outputs: - null - get_attr: [HAProxyPublicTLS, role_data, config_settings] - get_attr: [HAProxyInternalTLS, role_data, config_settings] + service_config_settings: + rsyslog: + tripleo_logging_sources_haproxy: + - {get_param: HAProxyLoggingSource} # BEGIN DOCKER SETTINGS puppet_config: config_volume: haproxy diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index f90718095b..59c358ac40 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -78,6 +78,12 @@ parameters: HAProxyInternalTLSKeysDirectory: default: '/etc/pki/tls/private/haproxy' type: string + HAProxyLoggingSource: + type: json + default: + tag: openstack.haproxy + file: /var/log/containers/haproxy/haproxy.log + startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}" HAProxySyslogAddress: default: /dev/log description: Syslog address where HAproxy will send its log @@ -194,6 +200,10 @@ outputs: expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1]) - {get_param: ContainerHAProxyImage} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") + service_config_settings: + rsyslog: + tripleo_logging_sources_haproxy: + - {get_param: HAProxyLoggingSource} # BEGIN DOCKER SETTINGS puppet_config: config_volume: haproxy diff --git a/releasenotes/notes/bug-1953672-haproxy-rsyslog-6f8e386f8909a253.yaml b/releasenotes/notes/bug-1953672-haproxy-rsyslog-6f8e386f8909a253.yaml new file mode 100644 index 0000000000..8aa3068450 --- /dev/null +++ b/releasenotes/notes/bug-1953672-haproxy-rsyslog-6f8e386f8909a253.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Rsyslog config for haproxy (https://bugs.launchpad.net/tripleo/+bug/1953672)