Fix default included syslog entries

- Resolved issue with all messages in /var/log/messages missing on CentOS/RHEL 7.x and 8.x Backport from master
DBezemer · Apr 21, 2020 · a6f2255 · a6f2255
1 parent 10dd4df
commit a6f2255
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 23 deletions.
diff --git a/SOURCES/haproxy.syslog.amzn1 b/SOURCES/haproxy.syslog.amzn1
@@ -2,10 +2,10 @@ $ModLoad imudp
 $UDPServerAddress 127.0.0.1
 $UDPServerRun 514
 
-$template HAProxy,"%syslogtag%%msg:::drop-last-lf%\n"
-$template TraditionalFormatWithPRI,"%pri-text%: %timegenerated% %syslogtag%%msg:::drop-last-lf%\n"
+$template HAProxy,"%TIMESTAMP% %syslogseverity-text:::UPPERCASE%: %msg%\n"
+$template HAProxyAccess,"%msg%\n"
 
-local2.=info /var/log/haproxy/access.log;HAProxy
-local2.=notice;local2.=warning /var/log/haproxy/status.log;TraditionalFormatWithPRI
-local2.error /var/log/haproxy/error.log;TraditionalFormatWithPRI
-local2.* ~
+local2.=info /var/log/haproxy/access.log;HAProxyAccess
+local2.error /var/log/haproxy/error.log;HAProxy
+local2.* /var/log/haproxy/status.log
+& ~
diff --git a/SOURCES/haproxy.syslog.amzn2 b/SOURCES/haproxy.syslog.amzn2
@@ -2,10 +2,10 @@ $ModLoad imudp
 $UDPServerAddress 127.0.0.1
 $UDPServerRun 514
 
-$template HAProxy,"%syslogtag%%msg:::drop-last-lf%\n"
-$template TraditionalFormatWithPRI,"%pri-text%: %timegenerated% %syslogtag%%msg:::drop-last-lf%\n"
+$template HAProxy,"%TIMESTAMP% %syslogseverity-text:::UPPERCASE%: %msg%\n"
+$template HAProxyAccess,"%msg%\n"
 
-local2.=info /var/log/haproxy/access.log;HAProxy
-local2.=notice;local2.=warning /var/log/haproxy/status.log;TraditionalFormatWithPRI
-local2.error /var/log/haproxy/error.log;TraditionalFormatWithPRI
+local2.=info /var/log/haproxy/access.log;HAProxyAccess
+local2.error /var/log/haproxy/error.log;HAProxy
+local2.* /var/log/haproxy/status.log
 local2.* stop
diff --git a/SOURCES/haproxy.syslog.el6 b/SOURCES/haproxy.syslog.el6
@@ -2,10 +2,10 @@ $ModLoad imudp
 $UDPServerAddress 127.0.0.1
 $UDPServerRun 514
 
-$template HAProxy,"%syslogtag%%msg:::drop-last-lf%\n"
-$template TraditionalFormatWithPRI,"%pri-text%: %timegenerated% %syslogtag%%msg:::drop-last-lf%\n"
+$template HAProxy,"%TIMESTAMP% %syslogseverity-text:::UPPERCASE%: %msg%\n"
+$template HAProxyAccess,"%msg%\n"
 
-local2.=info /var/log/haproxy/access.log;HAProxy
-local2.=notice;local2.=warning /var/log/haproxy/status.log;TraditionalFormatWithPRI
-local2.error /var/log/haproxy/error.log;TraditionalFormatWithPRI
-local2.* ~
+local2.=info /var/log/haproxy/access.log;HAProxyAccess
+local2.error /var/log/haproxy/error.log;HAProxy
+local2.* /var/log/haproxy/status.log
+& ~
diff --git a/SOURCES/haproxy.syslog.el7 b/SOURCES/haproxy.syslog.el7
@@ -2,10 +2,17 @@ $ModLoad imudp
 $UDPServerAddress 127.0.0.1
 $UDPServerRun 514
 
-$template HAProxy,"%syslogtag%%msg:::drop-last-lf%\n"
-$template TraditionalFormatWithPRI,"%pri-text%: %timegenerated% %syslogtag%%msg:::drop-last-lf%\n"
+$template HAProxy,"%TIMESTAMP% %syslogseverity-text:::UPPERCASE%: %msg:::drop-last-lf%\n"
+$template HAProxyAccess,"%msg%\n"
 
-local2.=info /var/log/haproxy/access.log;HAProxy
-local2.=notice;local2.=warning /var/log/haproxy/status.log;TraditionalFormatWithPRI
-local2.error /var/log/haproxy/error.log;TraditionalFormatWithPRI
-local2.* stop
+if $programname startswith 'haproxy' then {
+ if $syslogseverity == 6 then
+ action(type="omfile" file="/var/log/haproxy/access.log" template="HAProxyAccess")
+ stop
+ if $syslogseverity <= 3 then
+ action(type="omfile" file="/var/log/haproxy/error.log" template="HAProxy")
+ stop
+ if $syslogseverity <= 5 then
+ action(type="omfile" file="/var/log/haproxy/status.log" template="HAProxy")
+ stop
+}