#40 Add mmtaghostname module
Merged 9 months ago by alakatos. Opened 9 months ago by trawets.
rpms/ trawets/rsyslog fedora-mmtaghostname  into  rawhide

file modified
+20 -1
@@ -31,11 +31,12 @@ 

  %bcond_without pgsql

  %bcond_without snmp

  %bcond_without udpspoof

+ %bcond_without mmtaghostname

  

  Summary: Enhanced system logging and kernel message trapping daemon

  Name: rsyslog

  Version: 8.2306.0

- Release: 3%{?dist}

+ Release: 4%{?dist}

  License: GPL-3.0-or-later AND Apache-2.0

  URL: http://www.rsyslog.com/

  Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@@ -112,6 +113,12 @@ 

  Summary: Fields extraction module

  Requires: %name = %version-%release

  

+ %if %{with mmtaghostname}

+ %package mmtaghostname

+ Summary: Message modification module supporting adding tags

+ Requires: %name = %version-%release

+ %endif

+ 

  %if %{with snmp}

  %package mmsnmptrapd

  Summary: Message modification module for snmptrapd generated messages
@@ -271,6 +278,9 @@ 

  and either a large number of fields is needed or a specific field is used multiple

  times inside filters.

  

+ %description mmtaghostname

+ This module provides message modification for changing or adding the host name.

+ 

  %if %{with snmp}

  %description mmsnmptrapd

  This message modification module takes messages generated from snmptrapd and
@@ -488,6 +498,9 @@ 

  	--enable-mmkubernetes \

  	--enable-mmjsonparse \

  	--enable-mmnormalize \

+ %if %{with mmtaghostname}

+ 	--enable-mmtaghostname \

+ %endif

  %if %{with snmp}

  	--enable-mmsnmptrapd \

  %endif
@@ -665,6 +678,9 @@ 

  %files mmnormalize

  %{_libdir}/rsyslog/mmnormalize.so

  

+ %files mmtaghostname

+ %{_libdir}/rsyslog/mmtaghostname.so

+ 

  %if %{with snmp}

  %files mmsnmptrapd

  %{_libdir}/rsyslog/mmsnmptrapd.so
@@ -754,6 +770,9 @@ 

  

  

  %changelog

+ * Wed Aug 16 2023 Stewart Smith <trawets@amazon.com> - 8.2306.0-4

+ - Add mmtaghostname module as a subpackage

+ 

  * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.2306.0-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

  

It appears that some people are finding use for this rsyslog module, and
it doesn't add any more build-dependencies for rsyslog.

Add it as a bcond to make a more minimal rsyslog possible, as well as
keeping the pattern of having all of these as options.

Fixes: https://github.com/amazonlinux/amazon-linux-2023/issues/122
(and I may as well upstream the packaging change in Fedora so that others can benefit)

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/5728c2d13dc54531acf707880ccc2ba4

Hi, thanks for the PR.
Could you update the NVR and the changelog as well?

rebased onto c5f5013

9 months ago

NVR bumped and changelog amended. I always have the dilemma if to do so or not when sending a PR - most things don't need a new release and could happily be queued up.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/cd98a72612f6406582da7c4ee19d20f3

Yes, it could be queued up. But it's important to have them in the changelog and I doubt that any of us will not forget to include it in the changelog if we do an upgrade anytime in the future :D
Thanks. I will merge it.

Pull-Request has been merged by alakatos

9 months ago
Metadata