diff --git a/SOURCES/sos-bz2023867-cleaner-hostnames-improvements.patch b/SOURCES/sos-bz2023867-cleaner-hostnames-improvements.patch
index 5d71ffb..cceb1de 100644
--- a/SOURCES/sos-bz2023867-cleaner-hostnames-improvements.patch
+++ b/SOURCES/sos-bz2023867-cleaner-hostnames-improvements.patch
@@ -1542,3 +1542,56 @@ index 35377a31..229c7de4 100644
--
2.31.1
+From cafd0f3a52436a3966576e7db21e5dd17c06f0cc Mon Sep 17 00:00:00 2001
+From: Jake Hunsaker <jhunsake@redhat.com>
+Date: Sun, 12 Dec 2021 11:10:46 -0500
+Subject: [PATCH] [hostname] Fix edge case for new hosts in a known subdomain
+
+Fixes an edge case that would cause us to at first not recognize that a
+given hostname string is a new host in a known subdomain, but then on
+the obfuscation attempt properly recognize it as such and result in an
+incomplete obfuscation.
+
+This was mostly triggered by specific patterns for build hosts within
+`sos_commands/rpm/package-data`. With this refined check, these types of
+matches are properly obfuscated.
+
+Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
+---
+ sos/cleaner/mappings/hostname_map.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/sos/cleaner/mappings/hostname_map.py b/sos/cleaner/mappings/hostname_map.py
+index 5cd8e9857..33b0e6c80 100644
+--- a/sos/cleaner/mappings/hostname_map.py
++++ b/sos/cleaner/mappings/hostname_map.py
+@@ -129,7 +129,7 @@ def get(self, item):
+ item = item[0:-1]
+ if not self.domain_name_in_loaded_domains(item.lower()):
+ return item
+- if item.endswith(('.yaml', '.yml', '.crt', '.key', '.pem')):
++ if item.endswith(('.yaml', '.yml', '.crt', '.key', '.pem', '.log')):
+ ext = '.' + item.split('.')[-1]
+ item = item.replace(ext, '')
+ suffix += ext
+@@ -148,7 +148,8 @@ def get(self, item):
+ if len(_test) == 1 or not _test[0]:
+ # does not match existing obfuscation
+ continue
+- elif _test[0].endswith('.') and not _host_substr:
++ elif not _host_substr and (_test[0].endswith('.') or
++ item.endswith(_existing)):
+ # new hostname in known domain
+ final = super(SoSHostnameMap, self).get(item)
+ break
+@@ -219,8 +220,8 @@ def sanitize_domain(self, domain):
+ # don't obfuscate vendor domains
+ if re.match(_skip, '.'.join(domain)):
+ return '.'.join(domain)
+- top_domain = domain[-1]
+- dname = '.'.join(domain[0:-1])
++ top_domain = domain[-1].lower()
++ dname = '.'.join(domain[0:-1]).lower()
+ ob_domain = self._new_obfuscated_domain(dname)
+ ob_domain = '.'.join([ob_domain, top_domain])
+ self.dataset['.'.join(domain)] = ob_domain
diff --git a/SOURCES/sos-bz2025403-nvidia-GPU-info.patch b/SOURCES/sos-bz2025403-nvidia-GPU-info.patch
new file mode 100644
index 0000000..30fbb53
--- /dev/null
+++ b/SOURCES/sos-bz2025403-nvidia-GPU-info.patch
@@ -0,0 +1,46 @@
+From f2cc67750f55a71edff0c527a1bfc14fde8132c3 Mon Sep 17 00:00:00 2001
+From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+Date: Mon, 8 Nov 2021 10:50:03 +0530
+Subject: [PATCH] [nvidia]:Patch to update nvidia plugin for GPU info
+
+This patch is to update nvidia plugin to collect
+logs for Nvidia GPUs
+
+Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+Reported-by: Borislav Stoymirski <borislav.stoymirski@bg.ibm.com>
+Reported-by: Yesenia Jimenez <yesenia@us.ibm.com>
+---
+ sos/report/plugins/nvidia.py | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/sos/report/plugins/nvidia.py b/sos/report/plugins/nvidia.py
+index 09aaf586b..9e21b478e 100644
+--- a/sos/report/plugins/nvidia.py
++++ b/sos/report/plugins/nvidia.py
+@@ -23,13 +23,24 @@ def setup(self):
+ '--list-gpus',
+ '-q -d PERFORMANCE',
+ '-q -d SUPPORTED_CLOCKS',
+- '-q -d PAGE_RETIREMENT'
++ '-q -d PAGE_RETIREMENT',
++ '-q',
++ '-q -d ECC',
++ 'nvlink -s',
++ 'nvlink -e'
+ ]
+
+ self.add_cmd_output(["nvidia-smi %s" % cmd for cmd in subcmds])
+
+ query = ('gpu_name,gpu_bus_id,vbios_version,temperature.gpu,'
+- 'utilization.gpu,memory.total,memory.free,memory.used')
++ 'utilization.gpu,memory.total,memory.free,memory.used,'
++ 'clocks.applications.graphics,clocks.applications.memory')
++ querypages = ('timestamp,gpu_bus_id,gpu_serial,gpu_uuid,'
++ 'retired_pages.address,retired_pages.cause')
+ self.add_cmd_output("nvidia-smi --query-gpu=%s --format=csv" % query)
++ self.add_cmd_output(
++ "nvidia-smi --query-retired-pages=%s --format=csv" % querypages
++ )
++ self.add_journal(boot=0, identifier='nvidia-persistenced')
+
+ # vim: set et ts=4 sw=4 :
diff --git a/SOURCES/sos-bz2030741-rhui-logs.patch b/SOURCES/sos-bz2030741-rhui-logs.patch
new file mode 100644
index 0000000..dcfbc89
--- /dev/null
+++ b/SOURCES/sos-bz2030741-rhui-logs.patch
@@ -0,0 +1,24 @@
+From aa2887f71c779448b22e4de67ae68dbaf218b7b9 Mon Sep 17 00:00:00 2001
+From: Taft Sanders <taftsanders@gmail.com>
+Date: Fri, 10 Dec 2021 09:34:59 -0500
+Subject: [PATCH] [rhui] New log folder
+
+Included new log folder per Bugzilla 2030741
+
+Signed-off-by: Taft Sanders <taftsanders@gmail.com>
+---
+ sos/report/plugins/rhui.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sos/report/plugins/rhui.py b/sos/report/plugins/rhui.py
+index 52065fb44..add024613 100644
+--- a/sos/report/plugins/rhui.py
++++ b/sos/report/plugins/rhui.py
+@@ -27,6 +27,7 @@ def setup(self):
+ "/var/log/rhui-subscription-sync.log",
+ "/var/cache/rhui/*",
+ "/root/.rhui/*",
++ "/var/log/rhui/*",
+ ])
+ # skip collecting certificate keys
+ self.add_forbidden_path("/etc/pki/rhui/**/*.key", recursive=True)
diff --git a/SPECS/sos.spec b/SPECS/sos.spec
index 88e5d29..064b506 100644
--- a/SPECS/sos.spec
+++ b/SPECS/sos.spec
@@ -5,7 +5,7 @@
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
Version: 4.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Group: Applications/System
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
Source1: sos-audit-%{auditversion}.tgz
@@ -36,6 +36,8 @@ Patch12: sos-bz2018033-plugin-timeouts-proper-handling.patch
Patch13: sos-bz2020777-filter-namespace-per-pattern.patch
Patch14: sos-bz2023867-cleaner-hostnames-improvements.patch
Patch15: sos-bz2025610-RHTS-api-change.patch
+Patch16: sos-bz2025403-nvidia-GPU-info.patch
+Patch17: sos-bz2030741-rhui-logs.patch
%description
@@ -62,6 +64,8 @@ support technicians and developers.
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
+%patch17 -p1
%build
%py3_build
@@ -128,6 +132,14 @@ of the system. Currently storage and filesystem commands are audited.
%ghost /etc/audit/rules.d/40-sos-storage.rules
%changelog
+* Sun Dec 19 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-8
+- [rhui] New log folder
+ Resolves: bz2030741
+- nvidia]:Patch to update nvidia plugin for GPU info
+ Resolves: bz2025403
+- [hostname] Fix edge case for new hosts in a known subdomain
+ Resolves: bz2023867
+
* Wed Dec 08 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-7
- [hostname] Simplify case matching for domains
Resolves: bz2023867