Rsyslog: Bump Package version. Add RELP Protocol. Add ability to compress UDP & TCP protocols. Update configuration files to newer standards. (#701)

rsyslog: add support for RELP and compression, and update config files

packages/addons/service/rsyslog/changelog.txt

@@ -1,2 +1,7 @@
 8.0.100
 - Initial addon
+
+8.0.101
+- Add RELP Protocol
+- Add ability to compress messages using TCP/UDP protocols
+- Update configuration files using newer standards

packages/addons/service/rsyslog/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="rsyslog"
 PKG_VERSION="8.21.0"
-PKG_REV="100"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rsyslog"
@@ -37,6 +37,8 @@ PKG_ADDON_REPOVERSION="8.0"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-imfile \
                            --enable-imjournal \
+                           --enable-relp \
+                           --enable-omjournal \
                            ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes"
 

packages/addons/service/rsyslog/source/bin/rsyslog.init

@@ -26,9 +26,13 @@ oe_setup_addon service.rsyslog
   if [ ! -z "$RSYSLOG_IP_NAME_FQDN" ]
   then
     cat "$ADDON_DIR/config/common.conf"
+    [ "$RSYSLOG_PROTOCOL" == "RELP" ] && cat "$ADDON_DIR/config/relp.conf"
     [ "$RSYSLOG_JOURNAL_LOGGING" == "true" ] && cat "$ADDON_DIR/config/journal.conf"
     [ "$RSYSLOG_KODI_LOGGING" == "true" ] && cat "$ADDON_DIR/config/kodi.conf"
-    [ "$RSYSLOG_PROTOCOL" == "UDP" ] && PROTOCOL="@" || PROTOCOL="@@"
+    [ "$RSYSLOG_PROTOCOL" == "UDP" ] && PROTOCOL="@"
-    echo "*.* $PROTOCOL$RSYSLOG_IP_NAME_FQDN:$RSYSLOG_PORT"
+    [ "$RSYSLOG_PROTOCOL" == "TCP" ] && PROTOCOL="@@"
+    [ "$RSYSLOG_PROTOCOL" == "RELP" ] && PROTOCOL="omrelp"
+    [ "$RSYSLOG_PROTOCOL" == "RELP" ] && ZLIB="0" || [ "$RSYSLOG_ZLIB_COMPRESSION" == "true" ] && ZLIB="$RSYSLOG_ZLIB_COMPRESSION_LEVEL" || ZLIB="0"
+    [ "$RSYSLOG_PROTOCOL" == "RELP" ] && echo "action(type=\"$PROTOCOL\" target=\"$RSYSLOG_IP_NAME_FQDN\" port=\"$RSYSLOG_PORT\")" || echo "action(type=\"omfwd\" target=\"$RSYSLOG_IP_NAME_FQDN\" protocol=\"$RSYSLOG_PROTOCOL\" port=\"$RSYSLOG_PORT\")"
   fi
 ) > "$ADDON_HOME/rsyslog.conf"

packages/addons/service/rsyslog/source/config/common.conf

@@ -1,6 +1,7 @@
-$ModLoad imuxsock
+module(load="imuxsock"
-$OmitLocalLogging on
+  SysSock.RateLimit.Interval="1"
+  sysSock.parseHostname="on")
+
 $AddUnixListenSocket /run/systemd/journal/syslog
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 $WorkDirectory /storage/.kodi/temp
-

packages/addons/service/rsyslog/source/config/journal.conf

@@ -1,3 +1,4 @@
-$ModLoad imjournal
+module(load="imjournal")
-$ModLoad imklog
+module(load="omjournal")
+module(load="imklog")
 

packages/addons/service/rsyslog/source/config/kodi.conf

@@ -1,65 +1,74 @@
-$ModLoad imfile
+module(load="imfile")
-$InputFileName  /storage/.kodi/temp/kodi.log
-$InputFileTag kodi
-$InputFileStateFile kodi
-$InputFileSeverity emerg
-$InputFileFacility local0
-$InputRunFileMonitor
-$InputFilePersistStateInterval 1
 
-$InputFileName  /storage/.kodi/temp/kodi.log
+input(type="imfile"
-$InputFileTag kodi
+    File="/storage/.kodi/temp/kodi.log"
-$InputFileStateFile kodi
+    Tag="kodi"
-$InputFileSeverity alert
+    Severity="emerg"
-$InputFileFacility local1
+    Facility="local0"
-$InputRunFileMonitor
+    deleteStateOnFileDelete="on"
-$InputFilePersistStateInterval 1
+    escapeLF="on"
+    PersistStateInterval="5")
 
-$InputFileName  /storage/.kodi/temp/kodi.log
+input(type="imfile"
-$InputFileTag kodi
+    File="/storage/.kodi/temp/kodi.log"
-$InputFileStateFile kodi
+    Tag="kodi"
-$InputFileSeverity crit
+    Severity="alert"
-$InputFileFacility local2
+    Facility="local1"
-$InputRunFileMonitor
+    deleteStateOnFileDelete="on"
-$InputFilePersistStateInterval 1
+    escapeLF="on"
+    PersistStateInterval="5")
 
-$InputFileName  /storage/.kodi/temp/kodi.log
+input(type="imfile"
-$InputFileTag kodi
+    File="/storage/.kodi/temp/kodi.log"
-$InputFileStateFile kodi
+    Tag="kodi"
-$InputFileSeverity error
+    Severity="crit"
-$InputFileFacility local3
+    Facility="local2"
-$InputRunFileMonitor
+    deleteStateOnFileDelete="on"
-$InputFilePersistStateInterval 1
+    escapeLF="on"
+    PersistStateInterval="5")
 
-$InputFileName  /storage/.kodi/temp/kodi.log
+input(type="imfile"
-$InputFileTag kodi
+    File="/storage/.kodi/temp/kodi.log"
-$InputFileStateFile kodi
+    Tag="kodi"
-$InputFileSeverity warning
+    Severity="error"
-$InputFileFacility local4
+    Facility="local3"
-$InputRunFileMonitor
+    deleteStateOnFileDelete="on"
-$InputFilePersistStateInterval 1
+    escapeLF="on"
+    PersistStateInterval="5")
 
-$InputFileName  /storage/.kodi/temp/kodi.log
+input(type="imfile"
-$InputFileTag kodi
+    File="/storage/.kodi/temp/kodi.log"
-$InputFileStateFile kodi
+    Tag="kodi"
-$InputFileSeverity notice
+    Severity="warning"
-$InputFileFacility local5
+    Facility="local4"
-$InputRunFileMonitor
+    deleteStateOnFileDelete="on"
-$InputFilePersistStateInterval 1
+    escapeLF="on"
+    PersistStateInterval="5")
 
-$InputFileName  /storage/.kodi/temp/kodi.log
+input(type="imfile"
-$InputFileTag kodi
+    File="/storage/.kodi/temp/kodi.log"
-$InputFileStateFile kodi
+    Tag="kodi"
-$InputFileSeverity info  
+    Severity="notice"
-$InputFileFacility local6
+    Facility="local5"
-$InputRunFileMonitor
+    deleteStateOnFileDelete="on"
-$InputFilePersistStateInterval 1
+    escapeLF="on"
+    PersistStateInterval="5")
 
-$InputFileName  /storage/.kodi/temp/kodi.log
+input(type="imfile"
-$InputFileTag kodi
+    File="/storage/.kodi/temp/kodi.log"
-$InputFileStateFile kodi
+    Tag="kodi"
-$InputFileSeverity debug 
+    Severity="info"
-$InputFileFacility local7
+    Facility="local6"
-$InputRunFileMonitor
+    deleteStateOnFileDelete="on"
-$InputFilePersistStateInterval 1
+    escapeLF="on"
+    PersistStateInterval="5")
+
+input(type="imfile"
+    File="/storage/.kodi/temp/kodi.log"
+    Tag="kodi"
+    Severity="debug"
+    Facility="local7"
+    deleteStateOnFileDelete="on"
+    escapeLF="on"
+    PersistStateInterval="5")
 

packages/addons/service/rsyslog/source/config/relp.conf

@@ -0,0 +1,2 @@
+module(load="omrelp")
+

packages/addons/service/rsyslog/source/resources/language/English/strings.po

@@ -30,3 +30,11 @@ msgstr ""
 msgctxt "#30006"
 msgid "Log Kodi"
 msgstr ""
+
+msgctxt "#30007"
+msgid "Zlib Compression"
+msgstr ""
+
+msgctxt "#30008"
+msgid "Level"
+msgstr ""

packages/addons/service/rsyslog/source/resources/settings.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
    <category   label="30000">
-      <setting label="30001" type="bool"      id="RSYSLOG_MANUAL"          default="false"                          />
+      <setting label="30001" type="bool"      id="RSYSLOG_MANUAL"                                              default="true" />
-      <setting label="30002" type="text"      id="RSYSLOG_IP_NAME_FQDN"                      visible="eq(-1,false)" />
+      <setting label="30002" type="text"      id="RSYSLOG_IP_NAME_FQDN"                                                         visible="eq(-1,false)" />
-      <setting label="30003" type="number"    id="RSYSLOG_PORT"            default="514"     visible="eq(-2,false)" />
+      <setting label="30003" type="number"    id="RSYSLOG_PORT"                                                default="514"    visible="eq(-2,false)" />
-      <setting label="30004" type="labelenum" id="RSYSLOG_PROTOCOL"        lvalues="UDP|TCP" visible="eq(-3,false)" />
+      <setting label="30004" type="labelenum" id="RSYSLOG_PROTOCOL"               lvalues="UDP|TCP|RELP"                        visible="eq(-3,false)" />
-      <setting label="30005" type="bool"      id="RSYSLOG_JOURNAL_LOGGING" default="false"   visible="eq(-4,false)" />
+      <setting label="30005" type="bool"      id="RSYSLOG_JOURNAL_LOGGING"                                     default="false"  visible="eq(-4,false)" />
-      <setting label="30006" type="bool"      id="RSYSLOG_KODI_LOGGING"    default="true"    visible="eq(-5,false)" />
+      <setting label="30006" type="bool"      id="RSYSLOG_KODI_LOGGING"                                        default="true"   visible="eq(-5,false)" />
+      <setting label="30007" type="bool"      id="RSYSLOG_ZLIB_COMPRESSION"                                    default="false"  visible="eq(-6,false)+!eq(-3,2)" />
+      <setting label="30008" type="labelenum" id="RSYSLOG_ZLIB_COMPRESSION_LEVEL" values="0|1|2|3|4|5|6|7|8|9" default="0"      visible="eq(-7,false)+!eq(-4,2)+eq(-1,true)" enable="eq(-1,true)" subsetting="true" />
    </category>
 </settings>

packages/addons/service/rsyslog/source/settings-default.xml

@@ -5,4 +5,6 @@
    <setting id="RSYSLOG_MANUAL" value="false"/>
    <setting id="RSYSLOG_PORT" value="514"/>
    <setting id="RSYSLOG_PROTOCOL" value="UDP"/>
+   <setting id="RSYSLOG_ZLIB_COMPRESSION" value="false" />
+   <setting id="RSYSLOG_ZLIB_COMPRESSION_LEVEL" value="0" />
 </settings>