New config file format, JSON library dependency change and new options for imkmsg, mmjsonparse and pmciscoios.
Add a hint that imkmsg is a contrib module and therefore not actively supported by the upstream developers. The example module load lines in the config are commented out because the input modules should be chosen carefully to avoid log duplication. Disabled the unlimited-select option, like Debian, ArchLinux and other distributions did. Signed-off-by: Clemens Gruber <[email protected]> --- Changes from v1: - Fixed mistakes - Improved config file - Explicitly disabled options projectroot/etc/rsyslog.conf | 25 +++++++++++++++++++------ rules/rsyslog.in | 24 ++++++++++++++++++++---- rules/rsyslog.make | 25 +++++++++++++++++++------ 3 files changed, 58 insertions(+), 16 deletions(-) diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf index 94115e4..2bce3da 100644 --- a/projectroot/etc/rsyslog.conf +++ b/projectroot/etc/rsyslog.conf @@ -1,11 +1,24 @@ # Begin /etc/rsyslog.conf -$ModLoad immark # provides --MARK-- message capability -$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) -$ModLoad imklog # provides kernel logging support (previously done by rklogd) +#module(load="imjournal" # provides access to the systemd journal +#module(load="imkmsg") # provides structured kernel logging support +#module(load="immark") # provides --MARK-- message capability +#module(load="imuxsock") # provides support for local system logging -daemon.* -/var/log/daemon.log -kern.* -/var/log/kern.log -user.* -/var/log/user.log +# Use traditional timestamp format. +# To enable high precision timestamps, comment out the following line. +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat + +# Where to place spool and state files +#$WorkDirectory /var/spool/rsyslog + +# Include all config files from /etc/rsyslog.d/ +#$IncludeConfig /etc/rsyslog.d/*.conf + +# First some standard log files. Log by facility. +#auth,authpriv.* /var/log/auth.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +user.* -/var/log/user.log # End /etc/rsyslog.conf diff --git a/rules/rsyslog.in b/rules/rsyslog.in index eab69d6..55ffadc 100644 --- a/rules/rsyslog.in +++ b/rules/rsyslog.in @@ -8,12 +8,13 @@ menuconfig RSYSLOG select GCCLIBS_GCC_S select ZLIB select LIBESTR - select JSON_C + select LIBFASTJSON select LIBNET if RSYSLOG_OMUDPSPOOF select SYSTEMD if RSYSLOG_SYSTEMD prompt "rsyslog " help - FIXME + rsyslog is a reliable system and kernel logging daemon with + modular design and high speed message processing. if RSYSLOG @@ -29,16 +30,18 @@ config RSYSLOG_SYSTEMD_UNIT config RSYSLOG_REGEXP bool - # 8.8.0 fail to build without regex support + # 8.21.0 fails to build without regexp support default y prompt "regular expression support" if BROKEN config RSYSLOG_INET bool - # 8.8.0 fail to run without inet support + # 8.21.0 fails to run without inet support default y prompt "networking support" if BROKEN +comment "modules ---" + config RSYSLOG_IMDIAG bool prompt "diag input module" @@ -52,6 +55,11 @@ config RSYSLOG_IMKLOG default y prompt "klog input module" +config RSYSLOG_IMKMSG + bool + default n + prompt "kmsg input module (contrib)" + config RSYSLOG_IMMARK bool default y @@ -80,6 +88,10 @@ config RSYSLOG_IMUXSOCK default y prompt "unix domain socket input module" +config RSYSLOG_MMJSONPARSE + bool + prompt "jsonparse message modification module" + config RSYSLOG_OMPROG bool prompt "program output module" @@ -96,6 +108,10 @@ config RSYSLOG_OMUXSOCK bool prompt "unix domain socket output module" +config RSYSLOG_PMCISCOIOS + bool + prompt "cisco ios parser module" + config RSYSLOG_PMLASTMSG bool prompt "lastmsg parser module" diff --git a/rules/rsyslog.make b/rules/rsyslog.make index 95a315b..58eacd3 100644 --- a/rules/rsyslog.make +++ b/rules/rsyslog.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2011 by Michael Olbrich <[email protected]> +# Copyright (C) 2016 by Clemens Gruber <[email protected]> # # See CREDITS for details about who has contributed to this project. # @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog # # Paths and names # -RSYSLOG_VERSION := 8.8.0 -RSYSLOG_MD5 := 188088dc496fb0a121edb8816d1fac83 +RSYSLOG_VERSION := 8.21.0 +RSYSLOG_MD5 := f9b89a192090cd56f80c2ff930b5fd30 RSYSLOG := rsyslog-$(RSYSLOG_VERSION) RSYSLOG_SUFFIX := tar.gz RSYSLOG_URL := http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX) @@ -39,15 +40,16 @@ RSYSLOG_LICENSE_FILES := \ RSYSLOG_CONF_TOOL := autoconf RSYSLOG_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --runstatedir=/run \ $(GLOBAL_LARGE_FILE_OPTION) \ --$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \ --disable-gssapi-krb5 \ --$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \ - --enable-kmsg \ + --$(call ptx/endis, PTXCONF_RSYSLOG_IMKMSG)-kmsg \ --$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \ --$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \ --disable-jemalloc \ - --enable-unlimited-select \ + --disable-unlimited-select \ --disable-debug \ --disable-rtinst \ --disable-debugless \ @@ -61,15 +63,18 @@ RSYSLOG_CONF_OPT := \ --disable-snmp \ --disable-uuid \ --disable-elasticsearch \ + --disable-elasticsearch-tests \ --disable-gnutls \ --disable-libgcrypt \ --enable-rsyslogrt \ --enable-rsyslogd \ + --disable-extended-tests \ --disable-mysql-tests \ --disable-mail \ --$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \ --disable-mmnormalize \ - --disable-mmjsonparse \ + --$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \ + --disable-mmgrok \ --disable-mmaudit \ --disable-mmanon \ --disable-mmutf8fix \ @@ -80,6 +85,7 @@ RSYSLOG_CONF_OPT := \ --disable-mmrfc5424addhmac \ --disable-relp \ --disable-guardtime \ + --disable-gt-ksi \ --disable-liblogging-stdlog \ --disable-rfc3195 \ --disable-testbench \ @@ -93,14 +99,16 @@ RSYSLOG_CONF_OPT := \ --$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \ --$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \ --disable-pmcisconames \ - --disable-pmciscoios \ + --$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \ --disable-pmaixforwardedfrom \ --disable-pmsnare \ + --disable-pmpanngfw \ --disable-omruleset \ --$(call ptx/endis, PTXCONF_RSYSLOG_OMUXSOCK)-omuxsock \ --disable-mmsnmptrapd \ --disable-omhdfs \ --disable-omkafka \ + --disable-kafka-tests \ --disable-ommongodb \ --disable-imzmq3 \ --disable-imczmq \ @@ -108,6 +116,8 @@ RSYSLOG_CONF_OPT := \ --disable-omczmq \ --disable-omrabbitmq \ --disable-omhiredis \ + --disable-omhttpfs \ + --disable-omamqp1 \ --disable-generate-man-pages ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT @@ -119,6 +129,7 @@ endif RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMDIAG) += imdiag RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMFILE) += imfile RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKLOG) += imklog +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKMSG) += imkmsg RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD) += imjournal RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMMARK) += immark RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMPSTATS) += impstats @@ -139,6 +150,8 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMSTDOUT) += omstdout RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD) += omjournal RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUDPSPOOF) += omudpspoof RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUXSOCK) += omuxsock +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_MMJSONPARSE) += mmjsonparse +RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMCISCOIOS) += pmciscoios RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMLASTMSG) += pmlastmsg # ---------------------------------------------------------------------------- -- 2.10.0 _______________________________________________ ptxdist mailing list [email protected]
