.gitignore

@@ -1,2 +1,2 @@
-SOURCES/sos-4.11.0.tar.gz
+SOURCES/sos-4.10.2.tar.gz
 SOURCES/sos-audit-0.3-1.tgz

.sos.metadata

@@ -1,2 +1,2 @@
-b95a041f0826234fcdc7ee452d31609972d5d556 SOURCES/sos-4.11.0.tar.gz
+b9350b4145cbd8936efe88920a70fcca46824145 SOURCES/sos-4.10.2.tar.gz
 00752b68ec5e1141192a9dab7d44377b8d637bf7 SOURCES/sos-audit-0.3-1.tgz

SOURCES/0001-python3-walrus-operator-and-rhel8-changes-only.patch

@@ -1,116 +0,0 @@
---- a/sos/report/plugins/coredump.py
-+++ b/sos/report/plugins/coredump.py
-@@ -72,8 +72,8 @@
-             cdump = line.split()
-             pid = cdump[4]
-             exe = cdump[-2]
--            if regex := self.get_option("executable"):
--                if not re.search(regex, exe, re.I):
-+            if self.get_option("executable"):
-+                if not re.search(self.get_option("executable"), exe, re.I):
-                     continue
-             cinfo = self.collect_cmd_output(f"coredumpctl info {pid}")
-             if cinfo['status'] != 0:
---- a/sos/collector/sosnode.py
-+++ b/sos/collector/sosnode.py
-@@ -372,7 +372,8 @@
-             for line in result.splitlines():
-                 if not is_list:
-                     try:
--                        if ls := line.split():
-+                        ls = line.split()
-+                        if ls:
-                             res.append(ls[0])
-                     except Exception as err:
-                         self.log_debug(f"Error parsing sos help: {err}")
---- a/sos/report/plugins/mongodb.py
-+++ b/sos/report/plugins/mongodb.py
-@@ -87,9 +87,11 @@
-     )
- 
-     def setup(self):
--        if get_juju_info := self.path_exists('/var/lib/juju/db'):
-+        if self.path_exists('/var/lib/juju/db'):
-+            get_juju_info = self.path_exists('/var/lib/juju/db')
-             self.db_folder = "/var/lib/juju/db"
--        elif get_juju_info := self.path_exists('/var/snap/juju-db/curent/db'):
-+        elif self.path_exists('/var/snap/juju-db/curent/db'):
-+            get_juju_info = self.path_exists('/var/snap/juju-db/curent/db')
-             self.db_folder = "/var/snap/juju-db/current/db"
- 
-         super().setup()
---- a/sos/report/plugins/loki.py	2025-11-24 11:20:56.237814760 +0100
-+++ b/sos/report/plugins/loki.py	2025-11-24 11:28:37.466603011 +0100
-@@ -143,7 +143,8 @@
-         if self.get_option("collect-logs"):
-             endpoint = self.get_option("endpoint") or "http://localhost:3100"
-             self.labels = []
--            if labels_option := self.get_option("labels"):
-+            labels_option = self.get_option("labels")
-+            if labels_option:
-                 if isinstance(labels_option, str) and labels_option:
-                     self.labels.extend(labels_option.split(":"))
-
---- a/sos/cleaner/archives/__init__.py	2025-09-22 19:44:51.272619200 +0200
-+++ b/sos/cleaner/archives/__init__.py	2025-09-22 23:28:15.116001268 +0200
-@@ -118,6 +118,8 @@ class SoSObfuscationArchive():
-         self.parsers = parsers  # TODO: include this in __init__?
- 
-     def load_parser_entries(self):
-+        self.soslog = logging.getLogger('sos')
-+        self.ui_log = logging.getLogger('sos_ui')
-         for parser in self.parsers:
-             parser.load_map_entries()
- 
-@@ -150,6 +152,7 @@ class SoSObfuscationArchive():
-         return line, count
- 
-     def obfuscate_arc_files(self, flist):
-+        self.load_parser_entries()
-         for filename in flist:
-             self.log_debug(f"    pid={os.getpid()}: obfuscating {filename}")
-             try:
---- a/sos/cleaner/__init__.py	2025-09-22 19:44:51.272619200 +0200
-+++ b/sos/cleaner/__init__.py	2025-09-22 23:32:17.606745778 +0200
-@@ -720,10 +720,11 @@ third party.
-             # based on files' sizes.
- 
-             files_obfuscated_count = total_sub_count = removed_file_count = 0
-+            # two nullification required before processes cloning
-+            archive.soslog = None
-+            archive.ui_log = None
-             archive_list = [archive for i in range(self.opts.jobs)]
--            with ProcessPoolExecutor(
--                    max_workers=self.opts.jobs,
--                    initializer=archive.load_parser_entries) as executor:
-+            with ProcessPoolExecutor(max_workers=self.opts.jobs) as executor:
-                 futures = executor.map(obfuscate_arc_files, archive_list,
-                                        [file_list[i::self.opts.jobs] for i in
-                                         range(self.opts.jobs)])
-
---- a/sos/collector/sosnode.py	2026-04-02 10:15:34.743009569 +0200
-+++ b/sos/collector/sosnode.py	2026-04-02 10:17:42.557250748 +0200
-@@ -163,7 +163,8 @@
-         if not self._sudo_binary:
-             _bin = self.opts.sudo_binary.split('/')[-1]
-             # verify the provided binary is at least in our PATH
--            if ret := self.run_command(f"command -v {_bin}"):
-+            ret = self.run_command(f"command -v {_bin}")
-+            if ret:
-                 if not ret['status'] == 0:
-                     err = f"Privilege escalation command not in PATH: {_bin}"
-                     self.log_error(err)
-
---- a/sos/report/plugins/logs.py	2026-04-02 10:19:59.641196712 +0200
-+++ b/sos/report/plugins/logs.py	2026-04-02 10:20:28.313299348 +0200
-@@ -38,7 +38,8 @@
-                         # this WILL break on anything other than basic echos
-                         # as shown in the rsyslog documentation
-                         if _ent.startswith('echo '):
--                            if envc := os.getenv(_ent.split()[1].strip(' $`')):
-+                            envc = os.getenv(_ent.split()[1].strip(' $`'))
-+                            if envc:
-                                 confs += glob.glob(envc)
-                         else:
-                             confs += glob.glob(_ent)
-

SOURCES/0001-sosreport-binary.patch

@@ -0,0 +1,31 @@
+--- /dev/null			2025-04-03 01:35:45.132999852 +0200
++++ sos-4.10.0/bin/sosreport	2025-04-15 13:54:04.924751581 +0200
+@@ -0,0 +1,6 @@
++#!/usr/bin/python3
++msg = ("sosreport binary is deprecated, use 'sos report' instead")
++print(msg)
++exit(1)
++
++# vim:ts=4 et sw=4
+
+--- /dev/null			2025-04-03 01:35:45.132999852 +0200
++++ sos-4.10.0/bin/sos-collector	2025-04-15 15:10:17.780281627 +0200
+@@ -0,0 +1,6 @@
++#!/usr/bin/python3
++msg = ("sos-collector binary is deprecated, use 'sos collector' instead")
++print(msg)
++exit(1)
++
++# vim:ts=4 et sw=4
+
+--- sos-4.10.0/setup.py	2025-04-15 15:17:21.938635468 +0200
++++ sos-4.10.0/setup.py	2025-04-15 15:17:41.328198501 +0200
+@@ -34,7 +34,7 @@
+     maintainer_email='jacob.r.hunsaker@gmail.com',
+     url='https://github.com/sosreport/sos',
+     license="GPLv2+",
+-    scripts=['bin/sos'],
++    scripts=['bin/sos', 'bin/sosreport', 'bin/sos-collector'],
+     data_files=data_files,
+     packages=find_packages(include=['sos', 'sos.*'])
+ )

SOURCES/0002-gcp-Catch-exceptions-when-PRODUCT_PATH-doesnt-exist.patch

@@ -0,0 +1,36 @@
+From 178d7fb1296dbcb744867d1b8a29678d1a3b0820 Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Mon, 26 Jan 2026 12:14:19 +0100
+Subject: [PATCH] [gcp] Catch exceptions when PRODUCT_PATH doesnt exist
+
+Catch exceptions when /sys/devices/virtual/dmi/id/product_name does not
+exist on a (rare) system, while user manually enabled gcp plugin.
+
+Closes: #4215
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ sos/report/plugins/gcp.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/sos/report/plugins/gcp.py b/sos/report/plugins/gcp.py
+index 24b50323..43ceec00 100644
+--- a/sos/report/plugins/gcp.py
++++ b/sos/report/plugins/gcp.py
+@@ -38,8 +38,11 @@ class GCP(Plugin, IndependentPlugin):
+         Checks if this plugin should be executed based on the presence of
+         GCE entry in sysfs.
+         """
+-        with open(self.PRODUCT_PATH, encoding='utf-8') as sys_file:
+-            return "Google Compute Engine" in sys_file.read()
++        try:
++            with open(self.PRODUCT_PATH, encoding='utf-8') as sys_file:
++                return "Google Compute Engine" in sys_file.read()
++        except OSError:
++            return False
+ 
+     def setup(self):
+         """
+-- 
+2.52.0
+

SOURCES/0002-sosreport-binary.patch

@@ -1,27 +0,0 @@
---- /dev/null	2025-10-28 14:11:21.494784405 +0100
-+++ sos-4.10.1/bin/sosreport	2025-12-04 08:46:53.277857061 +0100
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+echo "sosreport binary is deprecated, use 'sos report' instead"
-+exec sos report "$@"
-+
-+# vim:ts=4 et sw=4
---- /dev/null	2025-10-28 14:11:21.494784405 +0100
-+++ sos-4.10.1/bin/sos-collector	2025-12-04 08:48:04.661880220 +0100
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+echo "sos-collector binary is deprecated, use 'sos collector' instead"
-+exec sos collector "$@"
-+
-+# vim:ts=4 et sw=4
---- sos-4.10.1/setup.py	2025-04-15 15:17:21.938635468 +0200
-+++ sos-4.10.1/setup.py	2025-04-15 15:17:41.328198501 +0200
-@@ -34,7 +34,7 @@
-     maintainer_email='jacob.r.hunsaker@gmail.com',
-     url='https://github.com/sosreport/sos',
-     license="GPLv2+",
--    scripts=['bin/sos'],
-+    scripts=['bin/sos', 'bin/sosreport', 'bin/sos-collector'],
-     data_files=data_files,
-     packages=find_packages(include=['sos', 'sos.*'])
- )

SOURCES/0003-aap_containerized-Carry-forward-postproc-from-other.patch

@@ -0,0 +1,124 @@
+From 0c237bcaf476c9b5a28165b9124e08163af707ab Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Fri, 30 Jan 2026 21:50:52 +0100
+Subject: [PATCH] [aap_containerized] Carry forward postproc from other AAP
+ plugins
+
+Secrets obfuscations from 2a46e99 commit must be reflected in
+containerized plugin.
+
+Further, fix a typo in a regexp, to properly obfuscate:
+
+EMAIL_HOST_PASSWORD = 'FAKESECRET!!!'
+
+in (both) controller's settings.
+
+Closes: #4213
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ sos/report/plugins/aap_containerized.py | 37 +++++++++++++++++++------
+ sos/report/plugins/aap_controller.py    |  4 +--
+ 2 files changed, 30 insertions(+), 11 deletions(-)
+
+diff --git a/sos/report/plugins/aap_containerized.py b/sos/report/plugins/aap_containerized.py
+index 7baa5fb3..0c85d4b2 100644
+--- a/sos/report/plugins/aap_containerized.py
++++ b/sos/report/plugins/aap_containerized.py
+@@ -41,6 +41,7 @@ class AAPContainerized(Plugin, RedHatPlugin):
+     def setup(self):
+         # Check if username is passed as argument
+         username = self.get_option("username")
++        self.aap_directory_name = self.get_option("directory")
+         if not username:
+             self._log_warn("AAP username is missing, use '-k "
+                            "aap_containerized.username=<user>' to set it")
+@@ -61,16 +62,15 @@ class AAPContainerized(Plugin, RedHatPlugin):
+                     return
+ 
+         # Grab aap installation directory under user's home
+-        if not self.get_option("directory"):
++        if not self.aap_directory_name:
+             user_home_directory = os.path.expanduser(f"~{username}")
+-            aap_directory_name = self.path_join(user_home_directory, "aap")
+-        else:
+-            aap_directory_name = self.get_option("directory")
++            self.aap_directory_name = self.path_join(user_home_directory,
++                                                     "aap")
+ 
+         # Don't collect cert and key files from the installation directory
+-        if self.path_exists(aap_directory_name):
++        if self.path_exists(self.aap_directory_name):
+             forbidden_paths = [
+-                self.path_join(aap_directory_name, path)
++                self.path_join(self.aap_directory_name, path)
+                 for path in [
+                     "containers",
+                     "tls",
+@@ -93,10 +93,10 @@ class AAPContainerized(Plugin, RedHatPlugin):
+                 ]
+             ]
+             self.add_forbidden_path(forbidden_paths)
+-            self.add_copy_spec(aap_directory_name)
++            self.add_copy_spec(self.aap_directory_name)
+         else:
+-            self._log_error(f"Directory {aap_directory_name} does not exist "
+-                            "or invalid absolute path provided")
++            self._log_error(f"Directory {self.aap_directory_name} does not "
++                            "exist or invalid absolute path provided.")
+ 
+         # Gather output of following podman commands as user
+         podman_commands = [
+@@ -200,6 +200,24 @@ class AAPContainerized(Plugin, RedHatPlugin):
+         return False
+ 
+     def postproc(self):
++        # remove controller email password
++        file_path = f"{self.aap_directory_name}/controller/etc/settings.py"
++        jreg = r"(EMAIL_HOST_PASSWORD\s*=\s*)\'(.+)\'"
++        repl = r"\1********"
++        self.do_path_regex_sub(file_path, jreg, repl)
++
++        # remove gateway database password
++        file_path = f"{self.aap_directory_name}/gateway/etc/settings.py"
++        jreg = r"(\s*'PASSWORD'\s*:\s*)('.*')"
++        repl = r"\1********"
++        self.do_path_regex_sub(file_path, jreg, repl)
++
++        # Mask EDA optional secrets
++        file_path = f"{self.aap_directory_name}/eda/etc/settings.yaml"
++        regex = r"(\s*)(PASSWORD|MQ_USER_PASSWORD|SECRET_KEY)(:\s*)(.*$)"
++        replacement = r'\1\2\3********'
++        self.do_path_regex_sub(file_path, regex, replacement)
++
+         # Mask PASSWORD from print_settings command
+         jreg = r'((["\']?PASSWORD["\']?\s*[:=]\s*)[rb]?["\'])(.*?)(["\'])'
+         self.do_cmd_output_sub(
+@@ -214,4 +232,5 @@ class AAPContainerized(Plugin, RedHatPlugin):
+             jreg,
+             r'\1**********\5')
+ 
++
+ # vim: set et ts=4 sw=4 :
+diff --git a/sos/report/plugins/aap_controller.py b/sos/report/plugins/aap_controller.py
+index afb2508c..e2b5e39e 100644
+--- a/sos/report/plugins/aap_controller.py
++++ b/sos/report/plugins/aap_controller.py
+@@ -83,12 +83,12 @@ class AAPControllerPlugin(Plugin, RedHatPlugin):
+         self.do_path_regex_sub("/etc/tower/conf.d/postgres.py", jreg, repl)
+ 
+         # remove email password
+-        jreg = r"(EMAIL_HOST_PASSWORD\s*=)\'(.+)\'"
++        jreg = r"(EMAIL_HOST_PASSWORD\s*=\s*)\'(.+)\'"
+         repl = r"\1********"
+         self.do_path_regex_sub("/etc/tower/settings.py", jreg, repl)
+ 
+         # remove email password (if customized)
+-        jreg = r"(EMAIL_HOST_PASSWORD\s*=)\'(.+)\'"
++        jreg = r"(EMAIL_HOST_PASSWORD\s*=\s*)\'(.+)\'"
+         repl = r"\1********"
+         self.do_path_regex_sub("/etc/tower/conf.d/custom.py", jreg, repl)
+ 
+-- 
+2.52.0
+

SOURCES/0004-cleaner-Update-filename-after-converting-pem-to-text.patch

@@ -0,0 +1,121 @@
+From 0c7626683ae2dcbc5f7b0f00e0980895e0e1ce0d Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Mon, 2 Feb 2026 14:03:26 +0100
+Subject: [PATCH] [cleaner] Update filename after converting pem to text
+
+When converting PEM certificate to text, we need to update filename and
+short_name to the newly created file, to ensure cleaner handles the
+right file.
+
+Also, rename misleading short_name to rel_name as it keeps the rel.path
+to the filename.
+
+Closes: #4219
+Relevant: RHEL-145301
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ sos/cleaner/archives/__init__.py | 34 +++++++++++++++++++-------------
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+diff --git a/sos/cleaner/archives/__init__.py b/sos/cleaner/archives/__init__.py
+index e918e2e3..af6ed222 100644
+--- a/sos/cleaner/archives/__init__.py
++++ b/sos/cleaner/archives/__init__.py
+@@ -156,18 +156,18 @@ class SoSObfuscationArchive():
+         for filename in flist:
+             self.log_debug(f"    pid={os.getpid()}: obfuscating {filename}")
+             try:
+-                short_name = filename.split(self.archive_name + '/')[1]
+-                if self.should_skip_file(short_name):
++                rel_name = os.path.relpath(filename, start=self.extracted_path)
++                if self.should_skip_file(rel_name):
+                     continue
+                 if (not self.keep_binary_files and
+-                        self.should_remove_file(short_name)):
++                        self.should_remove_file(rel_name)):
+                     # We reach this case if the option --keep-binary-files
+                     # was not used, and the file is in a list to be removed
+-                    self.remove_file(short_name)
++                    self.remove_file(rel_name)
+                     continue
+                 if (self.keep_binary_files and
+                         (file_is_binary(filename) or
+-                         self.should_remove_file(short_name))):
++                         self.should_remove_file(rel_name))):
+                     # We reach this case if the option --keep-binary-files
+                     # is used. In this case we want to make sure
+                     # the cleaner doesn't try to clean a binary file
+@@ -180,28 +180,32 @@ class SoSObfuscationArchive():
+                 if is_certificate:
+                     if is_certificate == "certificatekey":
+                         # Always remove certificate Key files
+-                        self.remove_file(short_name)
++                        self.remove_file(rel_name)
+                         continue
+                     if self.treat_certificates == "keep":
+                         continue
+                     if self.treat_certificates == "remove":
+-                        self.remove_file(short_name)
++                        self.remove_file(rel_name)
+                         continue
+                     if self.treat_certificates == "obfuscate":
+-                        self.certificate_to_text(filename)
++                        # since the original filename is deleted, we must
++                        # update both "filename" and "rel_name"
++                        filename = self.certificate_to_text(filename)
++                        rel_name = os.path.relpath(filename,
++                                                   start=self.extracted_path)
+                 _parsers = [
+                     _p for _p in self.parsers if not
+                     any(
+-                        _skip.match(short_name) for _skip in _p.skip_patterns
++                        _skip.match(rel_name) for _skip in _p.skip_patterns
+                     )
+                 ]
+                 if not _parsers:
+                     self.log_debug(
+-                        f"Skipping obfuscation of {short_name or filename} "
++                        f"Skipping obfuscation of {rel_name or filename} "
+                         f"due to matching file skip pattern"
+                     )
+                     continue
+-                self.log_debug(f"Obfuscating {short_name or filename}")
++                self.log_debug(f"Obfuscating {rel_name or filename}")
+                 subs = 0
+                 with tempfile.NamedTemporaryFile(mode='w', dir=self.tmpdir) \
+                         as tfile:
+@@ -214,13 +218,13 @@ class SoSObfuscationArchive():
+                                 tfile.write(line)
+                             except Exception as err:
+                                 self.log_debug(f"Unable to obfuscate "
+-                                               f"{short_name}: {err}")
++                                               f"{rel_name}: {err}")
+                     tfile.seek(0)
+                     if subs:
+                         shutil.copyfile(tfile.name, filename)
+                         self.update_sub_count(subs)
+ 
+-                self.obfuscate_filename(short_name, filename)
++                self.obfuscate_filename(rel_name, filename)
+ 
+             except Exception as err:
+                 self.log_debug(f"    pid={os.getpid()}: caught exception on "
+@@ -309,11 +313,13 @@ class SoSObfuscationArchive():
+         """Convert a certificate to text. This is used when cleaner encounters
+         a certificate file and the option 'treat_certificates' is 'obfuscate'.
+         """
++        out_fn = f"{fname}.text"
+         self.log_info(f"Converting certificate file '{fname}' to text")
+         sos_get_command_output(
+             f"openssl storeutl -noout -text -certs {str(fname)}",
+-            to_file=f"{fname}.text")
++            to_file=out_fn)
+         os.remove(fname)
++        return out_fn
+ 
+     def remove_file(self, fname):
+         """Remove a file from the archive. This is used when cleaner encounters
+-- 
+2.52.0
+

SPECS/sos.spec

@@ -4,8 +4,8 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.11.0
+Version: 4.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -21,10 +21,12 @@ Recommends: python3-magic
 Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
-Obsoletes: sos-collector
+Obsoletes: sos-collector <= 1.9
-Patch1: 0001-python3-walrus-operator-and-rhel8-changes-only.patch
+Patch1: 0001-sosreport-binary.patch
-Patch2: 0002-sosreport-binary.patch
+Patch2: 0002-gcp-Catch-exceptions-when-PRODUCT_PATH-doesnt-exist.patch
-Patch3: 0003-revert-PR4092.patch
+Patch3: 0003-aap_containerized-Carry-forward-postproc-from-other.patch
+Patch4: 0004-cleaner-Update-filename-after-converting-pem-to-text.patch
+Patch5: 0005-revert-PR4092.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -38,50 +40,52 @@ support technicians and developers.
 %patch -P 1 -p1
 %patch -P 2 -p1
 %patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 5 -p1
 
 %build
 %py3_build
 
 %install
 %py3_install '--install-scripts=%{_sbindir}'
-rm -f %{buildroot}/usr/config/sos.conf
+
-rm -f %{buildroot}/usr/config/tmpfilesd-sos-rh.conf
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
-install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+install -d -m 700 %{buildroot}%{_sysconfdir}/%{name}/cleaner
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/presets.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/groups.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/extras.d
 install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
+install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 
+rm -rf %{buildroot}/usr/config/
+
 %find_lang %{name} || echo 0
 
 cd %{name}-audit-%{auditversion}
 DESTDIR=%{buildroot} ./install.sh
 cd ..
 
-mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
-
 # internationalization is currently broken. Uncomment this line once fixed.
 # %%files -f %%{name}.lang
 %files
 %{_sbindir}/sos
 %{_sbindir}/sosreport
 %{_sbindir}/sos-collector
+#%dir /etc/sos/cleaner
 %dir /etc/sos/presets.d
 %dir /etc/sos/extras.d
 %dir /etc/sos/groups.d
-/etc/tmpfiles.d/%{name}.conf
+%{_sysconfdir}/tmpfiles.d/%{name}.conf
 %{python3_sitelib}/*
-%{_mandir}/man1/sos-clean.1.gz
+%{_mandir}/man1/*
-%{_mandir}/man1/sos-upload.1.gz
-%{_mandir}/man1/sos-collect.1.gz
-%{_mandir}/man1/sos-help.1.gz
-%{_mandir}/man1/sos-mask.1.gz
-%{_mandir}/man1/sos-report.1.gz
-%{_mandir}/man1/sos.1.gz
 %{_mandir}/man5/sos.conf.5.gz
 %doc AUTHORS README.md
 %license LICENSE
 %config(noreplace) %{_sysconfdir}/sos/sos.conf
 %config(noreplace) %{_sysconfdir}/sos/cleaner
 
+
 %package audit
 Summary: Audit use of some commands for support purposes
 License: GPL-2.0-or-later
@@ -110,79 +114,101 @@ of the system. Currently storage and filesystem commands are audited.
 %license LICENSE
 
 %changelog
-* Thu Apr 02 2026 Jan Jansky <jjansky@redhat.com> = 4.11.0-1
-- Update to 4.11.0-1
-  Resolves: RHEL-157813
-
 * Thu Feb 26 2026 Jan Jansky <jjansky@redhat.com> = 4.10.2-2
 - Update to 4.10.2-2
-  Resolves: RHEL-142630
+  Resolves: RHEL-152471
 
 * Thu Jan 22 2026 Jan Jansky <jjansky@redhat.com> = 4.10.2-1
 - Update to 4.10.2-1
-  Resolves: RHEL-142630
+  Resolves: RHEL-142635
 
 * Fri Dec 05 2025 Jan Jansky <jjansky@redhat.com> = 4.10.1-2
-- Fixing sosreport and sos-collector binary
+- Update to 4.10.1-2
-  Resolves: RHEL-121468
+  Resolves: RHEL-121474
 
 * Tue Nov 25 2025 Jan Jansky <jjansky@redhat.com> = 4.10.1-1
 - Update to 4.10.1-1
-  Resolves: RHEL-121468
+  Resolves: RHEL-121474
 
 * Tue Sep 23 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-4
 - Update to 4.10.0-4
-  Resolves: RHEL-112413
+  Resolves: RHEL-113795
+
+* Wed Sep 17 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-3
+- Update to 4.10.0-3
+  Resolves: RHEL-113795
 
 * Wed Sep 17 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-2
 - Update to 4.10.0-2
-  Resolves: RHEL-112413
+  Resolves: RHEL-113795
 
 * Thu Aug 21 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-1
 - Update to 4.10.0
-  Resolves: RHEL-110499
+  Resolves: RHEL-110500
+  Resolves: RHEL-110501
+  Resolves: RHEL-110502
+  Resolves: RHEL-110503
 
 * Fri Jul 04 2025 Jan Jansky <jjansky@redhat.com> = 4.9.2-1
-- Update to 4.9.2 in RHEL 8
+- Update to 4.9.2 
-  Resolves: RHEL-101716
+  Resolves: RHEL-101717
+  Resolves: RHEL-101718
+  Resolves: RHEL-101719
+  Resolves: RHEL-101720
 
 * Fri May 30 2025 Jan Jansky <jjansky@redhat.com> = 4.9.1-2
-- Update to 4.9.1-2 in RHEL 8
+- Update to 4.9.1-2 in RHEL 9
-  Resolves: RHEL-86645
+  Resolves: RHEL-86668
+  Resolves: RHEL-86644
+  Resolves: RHEL-86647
+  Resolves: RHEL-86646
 
 * Tue Apr 15 2025 Jan Jansky <jjansky@redhat.com> = 4.9.1-1
-- Update to 4.9.1 in RHEL 8
+- Update to 4.9.1 in RHEL 9
-  Resolves: RHEL-86645
+  Resolves: RHEL-86668
+  Resolves: RHEL-86644
+  Resolves: RHEL-86647
+  Resolves: RHEL-86646
+
+* Fri Jan 24 2025 Jan Jansky <jjansky@redhat.com> = 4.8.2-2
+- Add new plugin aap_containerized
+  Resolves: RHEL-76057
 
 * Tue Jan 07 2025 Jan Jansky <jjansky@redhat.com> = 4.8.2-1
-- Update to 4.8.2 in RHEL 8
+- Update to 4.8.2 in RHEL 9
-  Resolves: RHEL-72941
+  Resolves: RHEL-72942
 
 * Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1
-- Update to 4.8.1 in RHEL 8
+- Update to 4.8.1 in RHEL 9
-  Resolves: RHEL-64160
+  Resolves: RHEL-64159
  
-* Fri Sep 27 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-3
+* Tue Oct 15 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-5
+- Rebase to 4.8.0 and adding credential obfuscation
+  Resolves: RHEL-58096
+
+* Fri Sep 27 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-4
 - Added credentials obfuscation from multiple files
-  Resolves: RHEL-58097
+  Resolves: RHEL-58096
 
-* Sat Sep 14 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-2
+* Wed Sep 25 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-3
-- Resolves: RHEL-22732
+- Update 4.8.0
-  Fix wrong formatting
+  Resolves: RHEL-58096
+
+* Thu Sep 19 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-2
+- Update to 4.8.0
+  Resolves: RHEL-58096
 
 * Mon Sep 09 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-1
 - New upstream release
-  Resolves: RHEL-58097
+  Resolves: RHEL-58096
 
-* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-2
+* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-3
 - reverting RHEL-22732 patch due to regressions
-  Resolves: RHEL-49779
+  Resolves: RHEL-49781
 
 * Fri Jun 21 2024 Pierguido Lambri <plambri@redhat.com> = 4.7.2-1
 - New upstream release
-  Resolves: RHEL-40871
+  Resolves: RHEL-49781
-  Resolves: RHEL-33703
-  Resolves: RHEL-22732
 
 * Thu May 09 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.1-3
 - [archive] Fix get_archive_root after files reordering
@@ -190,400 +216,305 @@ of the system. Currently storage and filesystem commands are audited.
 
 * Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
 - rebase to upstream 4.7.1
-  Resolves: RHEL-32104
+  Resolves: RHEL-32106
 
 * Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
 - rebase to upstream 4.7.0
-  Resolves: RHEL-26111
+  Resolves: RHEL-26115
 
 * Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
 - rebase to upstream 4.6.1
-  Resolves: RHEL-21173
+  Resolves: RHEL-21174
 - [redhat] Change authentication method for RHEL
-  Resolves: RHEL-21177
+  Resolves: RHEL-21178
 
 * Wed Oct 18 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-5
   [pulpcore] Scrub AUTH_LDAP_BIND_PASSWORD value
-  Resolves: RHEL-13697
+  Resolves: RHEL-13701
 
 * Tue Oct 17 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-4
 - [pulp] Fix dynaconf obfuscation and add AUTH_LDAP_BIND_PASSWORD
-  Resolves: RHEL-13697
+  Resolves: RHEL-13701
+
+* Thu Oct 12 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-3
+- [greenboot] seperate logs to a standalone plugin; enhance [microshift]
+  Resolves: SUPDEV148
 
 * Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
 - [openshift_ovn] Collect additional ovnkube node logs
   Resolves: SUPDEV145
 
 * Wed Aug 23 2023 Jan Jansky <jjansky@redhat.com> = 4.6.0-1
+- [ultrapath] Add new plugin for Huawei UltraPath
+  Resolves: bz2187407
 - [cleaner] Use data filter for extraction
-  Resolves: bz2218873
+  Resolves: bz2217906
+- [discovery] Enable the plugin by containers
+  Resolves: bz2222134
 
 * Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
-- Rebase sos to 4.5.6
+- Collect db files for ovn interconnect environment
-  Resolves: bz2226724
+  Resolves: bz2226682
 
-* Fri Jul 14 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-2
+* Fri Jul 14 2023 Jan Jansky <jjansky@redhat.com> - 4.5.5-2
-- Adding patch for mac obfuscation
+- Adding patch for cleaning mac addresses
-  Resolves: bz2218279
+  Resolves: bz2217943
-  Resolves: bz2216608
-  Resolves: bz2207562
 
 * Mon Jul 03 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-1
-- [clean] Respect permissions of sanitised files
+- Rebase on upstream 4.5.5
-  Resolves: bz2218279
+  Resolves: bz2217943
-- [plugin] Fix exception when calling os.makedirs
-  Resolves: bz2216608
-- [cleaner] Enhance trailing characters list after AMC address
-  Resolves: bz2207562
 
-* Thu Jun 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
+* Wed May 31 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.4-1
-- [plugins] collect strings before commands
+- [specfile] add runtime requirement to python3-setuptools
-  Resolves: bz2203141
+  Resolves: bz2207776
-- [collector] collect report from primary node if in node_list
-  Resolves: bz2186460
-- [powerpc] collect invscout logs
-  Resolves: bz2210543
-- [rhc] New plugin for RHC
-  Resolves: bz2196649
 
-* Fri May 05 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
+* Thu May 04 2023 Jan Jansky <jjansky@redhat.com> = 4.5.3-1
+- [unpackaged] Print unpackaged symlinks instead of targets
+  Resolves: bz2169684
 - [report] Ignore case when scrubbing via do_file_sub
-  Resolves: bz2143272
+  Resolves: bz2174254
-- [subscription_manager] Scrub proxy passwords from repo_server_val
+- [powerpc]: To collect lparnumascore logs
-  Resolves: bz2177282
+  Resolves: bz2177984
-- [virsh] Scrub passwords in virt-manager logs
-  Resolves: bz2184062
 
 * Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
 - Rebase on upstream 4.5.1
-  Resolves: bz2175806
+  Resolves: bz2175808
-- [composer] Capure /etc/osbuild-composer file
+- [microshift] Fix microshift get and add commands
-  Resolves: bz2169776
+  Resolves: bz2175650
-- [ostree] Collect "ostree fsck" under plugin specific opt
-  Resolves: bz2161533
-- [iprconfig] guard whole plugin by sg kmod predicate
-  Resolves: bz2176086
-- [cleaner] dont clean sys_tmp from final_path
-  Resolves: bz2176218
 
 * Tue Feb 07 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
 - Rebase on upstream 4.5.0
-  Resolves: bz2082614
+  Resolves: bz2082615
 
 * Thu Nov 03 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-4
 - [ocp] Add newly required labels to temp OCP namespace
-  Resolves: bz2130922
+  Resolves: bz2130976
 
 * Fri Oct 28 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-3
 - [cleaner] Apply compile_regexes after a regular parse line
-  Resolves: bz2138173
+  Resolves: bz2138174
 
 * Thu Sep 22 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-2
 - [utilities] Relax from hard dependency of python3-magic
-  Resolves: bz2129038
+  Resolves: bz2126089
 - [dnf] Collect legacy yum config symlinks, properly obfuscate pwds
-  Resolves: bz2100154
+  Resolves: bz2125499
 
 * Fri Sep 09 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-1
 - Rebase on upstream 4.4
-  Resolves: bz2082614
+  Resolves: bz2082615
 - [redhat] Honour credential-less --upload-url on RedHat distro properly
-  Resolves: bz2059572
+  Resolves: bz2059573
-- [sos] Fix unhandled exception when concurrently removing temp dir
-  Resolves: bz2088439
-- [specfile] drop python3-libxml2 dependency
-  Resolves: bz2125486
 - [md] Restrict data capture to raid members
-  Resolves: bz2125485
+  Resolves: bz2062283
-- [cleaner] Use compiled regex lists for parsers by default
+- [sos] Fix unhandled exception when concurrently removing temp dir
-  Resolves: bz2043233
+  Resolves: bz2088440
-- [cgroups] not collect memory.kmem.slabinfo
-  Resolves: bz1995120
-- [report] Fix loop devices data gathering
-  Resolves: bz2010735
-- [insights] Collect /var/lib/insights
-  Resolves: bz2103233
-- [candlepin] collect information about SCA
-  Resolves: bz2060925
-- [manpages] Clarify --upload-directory applicable to FTP protocol only
-  Resolves: bz2063259
-- [cleaner] Dont obfuscate tmpdir path of local private_map
-  Resolves: bz2064815
-- [fibrechannel] collect Cisco fnic statistics
-  Resolves: bz2074715
-- [pulpcore] Collect db_tables_sizes
-  Resolves: bz2081433
-- [fibrechannel]: Update fibrechannel plugin to collect HBA logs
-  Resolves: bz2089591
-- [arcconf]: Update arcconf plugin to collect UART logs
-  Resolves: bz2090283
-- [pulpcore] Stop collecting commands relevant to old taskig system
-  Resolves: bz2093191
-- [dnf,yum] Merge plugins into dnf, remove yum plugin
-  Resolves: bz2100154
-- [policies] Simplify flow in _container_init()
-  Resolves: bz2100480
-- [pacemaker] Update collect cluster profile for pacemaker
-  Resolves: bz2065821
 
 * Mon Aug 29 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-3
 - [vdsm] Set LVM option use_devicesfile=0
-  Resolves: bz2093993
+  Resolves: bz2122355
 - [Plugin] Make forbidden path checks more efficient
-  Resolves: bz2099598
+  Resolves: bz2122354
 
 * Thu Jun 16 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-2
-- [ovirt] answer files: Filter out all password keys
+- [ocp, openshift] Re-align API collection options and rename
-  Resolves: bz2095263
+  Resolves: bz2065563
-- [plugins] Allow 'str' PlugOpt type to accept any value
-  Resolves: bz2079485
-- [tigervnc] Update collections for newer versions of TigerVNC
-  Resolves: bz2062908
-- [pacemaker] Redesign node enumeration logic
-  Resolves: bz2065805
-- crio: switch from parsing output in table format to json
-  Resolves: bz2092969
-- [report] Honor plugins' hardcoded plugin_timeout
-  Resolves: bz2079187
-- [report] --list-plugins should report used, not default,
-  Resolves: bz2079484
 - [utilities] Close file only when storing to file
-  Resolves: bz2079486
+  Resolves: bz2079492
-- [presets] Adjust OCP preset options, more OCP backports
+- [report] --list-plugins should report used, not default,
-  Resolves: bz2058279
+  Resolves: bz2079490
+- [report] Honor plugins' hardcoded plugin_timeout
+  Resolves: bz2079188
+- crio: switch from parsing output in table format to json
+  Resolves: bz2097674
+- [pacemaker] Redesign node enumeration logic
+  Resolves: bz2082914
+- [tigervnc] Update collections for newer versions of TigerVNC
+  Resolves: bz2066181
+- [plugins] Allow 'str' PlugOpt type to accept any value
+  Resolves: bz2079491
+- [ovirt] answer files: Filter out all password keys
+  Resolves: bz2095267
 
-* Mon Apr 04 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-1
+* Thu Mar 24 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-1
 - Rebase on upstream 4.3
-  Resolves: bz2055002
+  Resolves: 2055003
 - [sapnw] Fix IndexError exception
-  Resolves: bz1992938
+  Resolves: 2065551
+- [subscription_manager] collect syspurpose data via sub-man
+  Resolves: 2002333
 - [Plugin, utilities] Allow writing command output directly to disk
-  Resolves: bz1726023
+  Resolves: 2065564
 - [Ceph] Add support for containerized Ceph setup
-  Resolves: bz1882544
+  Resolves: 2065562
 - [unbound] Add new plugin for Unbound DNS resolver
-  Resolves: bz2018228
+  Resolves: 2065560
 - [discovery] Add new discovery plugin
-  Resolves: bz2018549
+  Resolves: 2065558
-- [vdsm] Exclude /var/lib/vdsm/storage/transient_disks
+- [system] Collect glibc tuning decisions
-  Resolves: bz2029154
+  Resolves: 2032913
 
 * Wed Feb 23 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-15
 - [sosnode] Handle downstream versioning for runtime option
-  Resolves: bz2036697
+  Resolves: bz2037350
 - [options] Fix logging on plugopts in effective sos command
-  Resolves: bz2054882
+  Resolves: bz2054883
 - [report] Honor plugins' hardcoded plugin_timeout
-  Resolves: bz2055547
+  Resolves: bz2055548
 - [policies] Set fallback to None sysroot, don't chroot to '/'
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [ovn_central] Rename container responsable of Red Hat
-  Resolves: bz2042966
+  Resolves: bz2043488
 
 * Wed Jan 26 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-13
 - [virsh] Catch parsing exception
-  Resolves: bz2041488
+  Resolves: bz2041855
 
 * Tue Jan 25 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-12
 - [foreman] Use psql-msgpack-decode wrapper for dynflow >= 1.6
-  Resolves: bz2043102
+  Resolves: bz2043104
 - [virsh] Call virsh commands in the foreground / with a TTY
-  Resolves: bz2041488
+  Resolves: bz2041855
 - [ovn_central] Account for Red Hat ovn package naming
-  Resolves: bz2042966
+  Resolves: bz2043488
 - [clean,parsers] Build regex lists for static items only once
-  Resolves: bz2036697
+  Resolves: bz2037350
 
 * Mon Jan 10 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-11
 - [report] Add journal logs for NetworkManager plugin
-  Resolves: bz2036697
+  Resolves: bz2037350
 
 * Fri Jan 07 2022 Pavel Moravec <pmoravec@redhat.com> = 4.2-9
 - add oc transport, backport various PRs for OCP
-  Resolves: bz2036697
+  Resolves: bz2037350
 - [report] Provide better warning about estimate-mode
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [hostname] Fix loading and detection of long base domains
-  Resolves: bz2023867
+  Resolves: bz2024893
 
 * Sun Dec 19 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-8
 - [rhui] New log folder
-  Resolves: bz2030741
+  Resolves: bz2031777
 - nvidia]:Patch to update nvidia plugin for GPU info
-  Resolves: bz2025403
+  Resolves: bz2034001
 - [hostname] Fix edge case for new hosts in a known subdomain
-  Resolves: bz2023867
+  Resolves: bz2024893
 
 * Wed Dec 08 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-7
 - [hostname] Simplify case matching for domains
-  Resolves: bz2023867
+  Resolves: bz2024893
 
 * Tue Nov 30 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-6
 - [redhat] Fix broken URI to upload to customer portal
-  Resolves: bz2025610
+  Resolves: bz2025611
 
 * Mon Nov 22 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-5
 - [clean,hostname_parser] Source /etc/hosts for obfuscation
-  Resolves: bz2023867
+  Resolves: bz2024893
 - [clean, hostname] Fix unintentionally case sensitive
-  Resolves: bz2023863
+  Resolves: bz2024892
 - [redhat] update SFTP API version to v2
-  Resolves: bz2025610
+  Resolves: bz2025611
 
 * Tue Nov 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-4
 - [report] Calculate sizes of dirs, symlinks and manifest in
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [report] shutdown threads for timeouted plugins
-  Resolves: bz2012857
+  Resolves: bz2012859
 - [report] fix filter_namespace per pattern
-  Resolves: bz2020777
+  Resolves: bz2020778
 - Ensure specific plugin timeouts are only set
-  Resolves: bz2018033
+  Resolves: bz2023481
 
 * Wed Nov 03 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-2
 - [firewall_tables] call iptables -t <table> based on nft
-  Resolves: bz2005195
+  Resolves: bz2011536
 - [report] Count with sos_logs and sos_reports in
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [foreman] Collect puma status and stats
-  Resolves: bz2011506
+  Resolves: bz2011507
 - [report] Overwrite pred=None before refering predicate
-  Resolves: bz2012856
+  Resolves: bz2012858
 - [openvswitch] add commands for offline analysis
-  Resolves: bz2004929
+  Resolves: bz2019697
 
 * Wed Oct 06 2021 Pavel Moravec <pmoravec@redhat.com> = 4.2-1
 - Rebase on upstream 4.2
-  Resolves: bz1998133
+  Resolves: bz1998134
 - [report] Implement --estimate-only
-  Resolves: bz1873185
+  Resolves: bz2011537
 - [omnipath_client] Opacapture to run only with allow changes
-  Resolves: bz1998433
+  Resolves: bz2011534
 - [unpackaged] deal with recursive loop of symlinks properly
-  Resolves: bz1998521
+  Resolves: bz2011533
 - [networking] prevent iptables-save commands to load nf_tables
-  Resolves: bz2001096
+  Resolves: bz2011538
 - [kernel] Capture Pressure Stall Information
-  Resolves: bz2002145
+  Resolves: bz2011535
 - [processor] Apply sizelimit to /sys/devices/system/cpu/cpuX
-  Resolves: bz2011413
+  Resolves: bz1869561
 
-* Wed Aug 11 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-5
+* Wed Aug 11 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-8
 - [report,collect] unify --map-file arguments
-  Resolves: bz1923938
+  Resolves: bz1985985
 - [rhui] add new plugin for RHUI 4
-  Resolves: bz1665947
+  Resolves: bz1992859
 - [username parser] Load usernames from `last` for LDAP users
-  Resolves: bz1985037
+  Resolves: bz1992861
 
-* Mon Jul 26 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-4
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-7
-- [options] allow variant option names in config file
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Resolves: bz1923938
+  Related: rhbz#1991688
-- [plugins] Set default predicate instead of None
-  Resolves: bz1985986
-- [MigrationResults] collect info about conversions
-  Resolves: bz1959598
 
-* Mon Jun 21 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-3
+* Tue Jul 27 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-6
-- [gluster] collect public keys from the right dir
-  Resolves: bz1925419
-- [cleaner] Only skip packaging-based files for the IP parse
-  Resolves: bz1964499
 - [networking] collect also tc filter show ingress
-  Resolves: bz1886711
+  Resolves: bz1985976
-- [archive] skip copying SELinux context for /proc and /sys
+- [cleaner] Only skip packaging-based files for the IP parser
-  Resolves: bz1965001
+  Resolves: bz1985982
 - [sssd] sssd plugin when sssd-common
-  Resolves: bz1967613
+  Resolves: bz1967718
 - Various OCP/cluster/cleanup enhancements
-  Resolves: bz1973675
+  Resolves: bz1985983
+- [options] allow variant option names in config file
+  Resolves: bz1985985
+- [plugins] Set default predicate instead of None
+  Resolves: bz1938874
+- [MigrationResults] collect info about conversions and
+  Resolves: bz1959779
 
-* Tue May 18 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-2
+* Wed Jun 02 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-4
+- [archive] skip copying SELinux context for /proc and /sys everytime
+  Resolves: bz1965002
 - Load maps from all archives before obfuscation
-  Resolves: bz1930181
+  Resolves: bz1967110
 - Multiple fixes in man pages
-  Resolves: bz1935603
+  Resolves: bz1967111
 - [ds] Mask password and encryption keys in ldif files
-  Resolves: bz1937298
+  Resolves: bz1967112
 - [report] add --cmd-timeout option
-  Resolves: bz1937418
+  Resolves: bz1967113
 - [cups] Add gathering cups-browsed logs
-  Resolves: bz1939963
+  Resolves: bz1967114
 - [sssd] Collect memory cache / individual logfiles
-  Resolves: bz1940502
+  Resolves: bz1967115
 - Collect ibmvNIC dynamic_debugs
-  Resolves: bz1942276
+  Resolves: bz1967116
 - [pulpcore] add plugin for pulp-3
-  Resolves: bz1956673
+  Resolves: bz1967117
 - [saphana] remove redundant unused argument of get_inst_info
-  Resolves: bz1959413
+  Resolves: bz1967118
 - [networking] Add nstat command support
-  Resolves: bz1961458
+  Resolves: bz1967119
 - [snapper] add a new plugin
-  Resolves: bz1961229
+  Resolves: bz1967120
 
-* Mon Apr 26 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-4
-- Rebase on upstream 4.1
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-  Resolves: bz1928679
 
-* Tue Feb 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-8
+* Thu Apr 01 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-3
-- Automatically create directory for sos-cleaner default_mapping
+- adding sos-audit
-  Resolves: bz1923937
+- [gluster] Add glusterd public keys and status files
+  Resolves: bz1925419
 
-* Fri Jan 29 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-7
+* Wed Mar 10 2021 Sandro Bonazzola <sbonazzo@redhat.com> - 4.1-1
-- [kdump] Gather the file kexec-dmesg.log
+- Rebase to 4.1
-  Resolves: bz1887402
-- [Policy] Handle additional FTP authentication issues
-  Resolves: bz1916729
-
-* Thu Jan 21 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-6
-- [networking] Collect 'ethtool -e <device>' conditionally only
-  Resolves: bz1917196
-
-* Wed Jan 06 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-5
-- [component] honour plugopts from config file
-  Resolves: bz1912889
-- [collector] declare sysroot for each component
-  Resolves: bz1912821
-- [plugins] Dont stop collecting by empty specfile when sizelimit=0
-  Resolves: bz1912910
-
-* Mon Jan 04 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-4
-- [component] Use sysroot from Policy when opts doesn't specify it
-  Resolves: bz1881118
-
-* Mon Dec 14 2020 Pavel Moravec <pmoravec@redhat.com> = 4.0-3
-- [ovirt] collect /etc/pki/ovirt-engine/.truststore
-  Resolves: bz1848095
-- [collector] allow overriding plain --cluster-type
-  Resolves: bz1895316
-- [component] Add log verbosity from presets
-  Resolves: bz1904045
-- [options] Fix --log-size=0 being ignored and unreported
-  Resolves: bz1905657
-- [report] collect broken symlinks
-  Resolves: bz1906598
-
-* Thu Oct 29 2020 Pavel Moravec <pmoravec@redhat.com> = 4.0-2
-- [cleaner] more streamlined sanitize_item method
-  Resolves: bz1827801
-- [openstack_ironic] Missing ironic-inspector configs
-  Resolves: bz1874295
-- Add support to collect hardware component logs
-  Resolves: bz1880372
-- [crio] collect /etc/crio/crio.conf.d/
-  Resolves: bz1881118
-- [policy] Handle additional failure conditions for FTP uploads
-  Resolves: bz1882368
-- [filesys] never collect content of /proc/fs/panfs
-  Resolves: bz1886782
-- [kdump] Collect new kdump logfiles
-  Resolves: bz1887390
-- [stratis] Collect key list and report engine
-  Resolves: bz1888012
-- return tmp-dir with absolute path
-  Resolves: bz1891562
-
-* Tue Oct 13 2020 Pavel Moravec <pmoravec@redhat.com> = 4.0-1
-- Rebase on upstream 4.0
-  Resolves: bz1827801