X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Frsyslog.conf;h=54022c1c90d3ed19be6b41819b2ee97cf92e1269;hb=refs%2Fheads%2Flog;hp=b6ce47bec4c1c77985ed57b2b81334d7a657dca6;hpb=18389d5c0a1128f195ac315d8cd6eacbe800961f;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index b6ce47b..54022c1 100644
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -54,21 +54,27 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 ########################
 
 # Log lines received from other servers (as well as our own logs) centrally.
-$template FacilityLog,"/data/log/rsyslog/%hostname%/facilities/%syslogfacility-text%.log"
-$template SeverityLog,"/data/log/rsyslog/%hostname%/severities/%syslogseverity-text%.log"
-$template AppLog,"/data/log/rsyslog/%hostname%/apps/%app-name%.log"
-$template AllLog,"/data/log/rsyslog/all.log"
+$template HostFacilityLog,"/data/log/rsyslog/hosts/%fromhost%/facilities/%syslogfacility-text%.log"
+$template HostSeverityLog,"/data/log/rsyslog/hosts/%fromhost%/severities/%syslogseverity-text%.log"
+$template HostAppLog,"/data/log/rsyslog/hosts/%fromhost%/apps/%app-name%.log"
 
 # Use a verbose logging format
 $template LogFormat, "%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag% %syslogfacility-text%.%syslogseverity-text%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
 
 # Log by facility, severity and appname
-*.*				?FacilityLog;LogFormat
-*.*				?SeverityLog;LogFormat
-*.*				?AppLog;LogFormat
+*.*				?HostFacilityLog;LogFormat
+*.*				?HostSeverityLog;LogFormat
+*.*				?HostAppLog;LogFormat
 # Log all entries in a single file, which is meant to be parsed by logcheck
 # (hence the traditional format).
-*.*				?AllLog;RSYSLOG_TraditionalFileFormat
+*.*				-/data/log/rsyslog/all.log;RSYSLOG_TraditionalFileFormat
+
+# Debugging format. Based on RSYSLOG_DebugFormat, available in later versions
+# of rsyslogd, with some variations.
+$template DebugFormat,"Debug line with all properties:\nFROMHOST: '%FROMHOST%', HOSTNAME: '%HOSTNAME%', PRI: %PRI%,\nsyslogtag '%syslogtag%', programname: '%programname%', APP-NAME: '%APP-NAME%', PROCID: '%PROCID%', MSGID: '%MSGID%',\nTIMESTAMP: '%TIMESTAMP%', STRUCTURED-DATA: '%STRUCTURED-DATA%', syslogtag: '%syslogtag%'\nmsg: '%msg%'\nescaped msg: '%msg:::drop-cc%'\nrawmsg: '%rawmsg%'\n\n"
+# Uncomment this to have detailed logging for debugging
+#*.*				-/data/log/rsyslog/debug.log;DebugFormat
+
 
 #######################
 #### Local logging ####