.gitignore

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

.sos.metadata

@@ -1,2 +1,2 @@
-b95a041f0826234fcdc7ee452d31609972d5d556 SOURCES/sos-4.11.0.tar.gz
+90d8b664a4e0593d60357342bb5f73af9908e29d SOURCES/sos-4.6.0.tar.gz
-00752b68ec5e1141192a9dab7d44377b8d637bf7 SOURCES/sos-audit-0.3-1.tgz
+9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.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/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-revert-PR4092.patch

@@ -1,49 +0,0 @@
---- a/sos/upload/targets/__init__.py	2025-09-16 19:57:27.294642506 +0200
-+++ b/sos/upload/targets/__init__.py	2025-09-16 19:59:44.498573843 +0200
-@@ -465,7 +465,7 @@
-                 self.upload_password or
-                 self._upload_password)
- 
--    def upload_sftp(self, user=None, password=None, user_dir=None):
-+    def upload_sftp(self, user=None, password=None):
-         """Attempts to upload the archive to an SFTP location.
- 
-         Due to the lack of well maintained, secure, and generally widespread
-@@ -540,13 +540,10 @@
-             raise Exception("Unable to connect via SFTP to "
-                             f"{self.get_upload_url_string()}")
- 
--        # certain implementations require file to be put in the user dir
--        put_cmd = (
--            f"put {self.upload_archive_name} "
--            f"{f'{user_dir}/' if user_dir else ''}"
--            f"{self._get_sftp_upload_name()}"
--        )
-+        put_cmd = (f'put {self.upload_archive_name} '
-+                   f'{self._get_sftp_upload_name()}')
-         ret.sendline(put_cmd)
-+
-         put_expects = [
-             '100%',
-             pexpect.TIMEOUT,
---- a/sos/upload/targets/redhat.py	2025-09-16 19:57:36.804628207 +0200
-+++ b/sos/upload/targets/redhat.py	2025-09-16 20:00:52.578728154 +0200
-@@ -145,7 +145,7 @@
-         return fname
- 
-     # pylint: disable=too-many-branches
--    def upload_sftp(self, user=None, password=None, user_dir=None):
-+    def upload_sftp(self, user=None, password=None):    
-         """Override the base upload_sftp to allow for setting an on-demand
-         generated anonymous login for the RH SFTP server if a username and
-         password are not given
-@@ -217,8 +217,7 @@
-                     f"{anon.status_code}): {anon.json()}"
-                 )
-         if _user and _token:
--            return super().upload_sftp(user=_user, password=_token,
--                                       user_dir=_user)
-+            return super().upload_sftp(user=_user, password=_token)
-         raise Exception("Could not retrieve valid or anonymous credentials")
- 
-     def check_file_too_big(self, archive):

SOURCES/sos-SUPDEV145-ovnkube-logs.patch

@@ -0,0 +1,126 @@
+From 43714aa5aeb3dcb0dec17dd026ca5c394cc06afd Mon Sep 17 00:00:00 2001
+From: Periyasamy Palanisamy <pepalani@redhat.com>
+Date: Fri, 11 Aug 2023 14:30:42 +0200
+Subject: [PATCH] Collect additional ovnkube node logs
+
+With Interconnect support in latest OVN-Kubernetes, ovnkube-nodes
+logs grew large. This commit adds the ability to collect those
+additional logs.
+
+Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
+---
+ sos/report/plugins/openshift_ovn.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
+index d81fc97aa..2d804e9ae 100644
+--- a/sos/report/plugins/openshift_ovn.py
++++ b/sos/report/plugins/openshift_ovn.py
+@@ -30,7 +30,8 @@ def setup(self):
+         # Collect ovn interconnect specific files if exists.
+         self.add_copy_spec([
+             "/var/lib/ovn-ic/etc/ovnnb_db.db",
+-            "/var/lib/ovn-ic/etc/ovnsb_db.db"
++            "/var/lib/ovn-ic/etc/ovnsb_db.db",
++            "/var/lib/ovn-ic/etc/libovsdb*log*"
+         ])
+ 
+         # The ovn cluster/status is not valid anymore for interconnect setup.
+From e11a594f942f9ae98aeb644c573293b391050657 Mon Sep 17 00:00:00 2001
+From: Periyasamy Palanisamy <pepalani@redhat.com>
+Date: Tue, 15 Aug 2023 11:47:20 +0200
+Subject: [PATCH] Collect ovn logs as much as possible
+
+The sosreport limits to collect logs at maximum of 25 MB in a given
+collection passed into add_copy_spec method. so this may lead into
+logs wouldn't have fully collected when user collected sos report
+without --all-logs option.
+Hence this commit ensures logs and dbs collected as much as possible
+when --all-logs option is not specified.
+
+Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
+---
+ sos/report/plugins/openshift_ovn.py | 25 +++++++++++++++++--------
+ 1 file changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
+index 2d804e9ae..347b15eea 100644
+--- a/sos/report/plugins/openshift_ovn.py
++++ b/sos/report/plugins/openshift_ovn.py
+@@ -20,19 +20,28 @@ class OpenshiftOVN(Plugin, RedHatPlugin):
+     profiles = ('openshift',)
+ 
+     def setup(self):
++        all_logs = self.get_option("all_logs")
++
+         self.add_copy_spec([
+             "/var/lib/ovn/etc/ovnnb_db.db",
+             "/var/lib/ovn/etc/ovnsb_db.db",
+-            "/var/lib/openvswitch/etc/keys",
+-            "/var/log/openvswitch/libreswan.log",
+-            "/var/log/openvswitch/ovs-monitor-ipsec.log"
+-        ])
+-        # Collect ovn interconnect specific files if exists.
++            "/var/lib/openvswitch/etc/keys"
++        ], sizelimit=300)
++
++        # Collect ovn interconnect specific db files if exists.
+         self.add_copy_spec([
+             "/var/lib/ovn-ic/etc/ovnnb_db.db",
+-            "/var/lib/ovn-ic/etc/ovnsb_db.db",
+-            "/var/lib/ovn-ic/etc/libovsdb*log*"
+-        ])
++            "/var/lib/ovn-ic/etc/ovnsb_db.db"
++        ], sizelimit=300)
++
++        # Collect libovsdb logs in case of ovn interconnect setup.
++        if not all_logs:
++            self.add_copy_spec([
++                "/var/lib/ovn-ic/etc/libovsdb.log",
++                "/var/lib/ovn-ic/etc/libovsdb*log.gz"
++            ], sizelimit=100)
++        else:
++            self.add_copy_spec("/var/lib/ovn-ic/etc/libovsdb*log*")
+ 
+         # The ovn cluster/status is not valid anymore for interconnect setup.
+         self.add_cmd_output([
+From 7cd6f61fd15ae7fc93d62cca927204351cdc1322 Mon Sep 17 00:00:00 2001
+From: Periyasamy Palanisamy <pepalani@redhat.com>
+Date: Wed, 30 Aug 2023 09:56:40 +0200
+Subject: [PATCH] Collect logs from ovnkube-controller container
+
+This enables ovn sos report plugin to collect logs ovnkube-controller
+container because ovn-kubernetes now provides option to run both
+ovnkube-node and ovnkube-controller in same container with this
+PR https://github.com/ovn-org/ovn-kubernetes/pull/3807.
+
+Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
+---
+ sos/report/plugins/openshift_ovn.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
+index 347b15eea..cb48057d3 100644
+--- a/sos/report/plugins/openshift_ovn.py
++++ b/sos/report/plugins/openshift_ovn.py
+@@ -16,7 +16,8 @@ class OpenshiftOVN(Plugin, RedHatPlugin):
+     """
+     short_desc = 'Openshift OVN'
+     plugin_name = "openshift_ovn"
+-    containers = ('ovnkube-master', 'ovnkube-node', 'ovn-ipsec')
++    containers = ('ovnkube-master', 'ovnkube-node', 'ovn-ipsec',
++                  'ovnkube-controller')
+     profiles = ('openshift',)
+ 
+     def setup(self):
+@@ -54,6 +55,10 @@ def setup(self):
+             'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +
+             'ct-zone-list'],
+             container='ovnkube-node')
++        self.add_cmd_output([
++            'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +
++            'ct-zone-list'],
++            container='ovnkube-controller')
+         # Collect ovs ct-zone-list directly on host for interconnect setup.
+         self.add_cmd_output([
+             'ovs-appctl -t /var/run/ovn-ic/ovn-controller.*.ctl ' +

SPECS/sos.spec

@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global auditversion 0.3-1
+%global auditversion 0.3
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.11.0
+Version: 4.6.0
-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
@@ -22,9 +22,7 @@ Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector
-Patch1: 0001-python3-walrus-operator-and-rhel8-changes-only.patch
+Patch1: sos-SUPDEV145-ovnkube-logs.patch
-Patch2: 0002-sosreport-binary.patch
-Patch3: 0003-revert-PR4092.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -35,9 +33,8 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
-%patch -P 1 -p1 
+%patch1 -p1
-%patch -P 2 -p1
+
-%patch -P 3 -p1
 
 %build
 %py3_build
@@ -61,17 +58,18 @@ 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
 %{_sbindir}/sos-collector
 %dir /etc/sos/presets.d
 %dir /etc/sos/extras.d
 %dir /etc/sos/groups.d
 /etc/tmpfiles.d/%{name}.conf
 %{python3_sitelib}/*
+%{_mandir}/man1/sosreport.1.gz
 %{_mandir}/man1/sos-clean.1.gz
-%{_mandir}/man1/sos-upload.1.gz
 %{_mandir}/man1/sos-collect.1.gz
+%{_mandir}/man1/sos-collector.1.gz
 %{_mandir}/man1/sos-help.1.gz
 %{_mandir}/man1/sos-mask.1.gz
 %{_mandir}/man1/sos-report.1.gz
@@ -84,7 +82,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/sos/{cleaner,presets.d,extras.d,groups.d}
 
 %package audit
 Summary: Audit use of some commands for support purposes
-License: GPL-2.0-or-later
+License: GPLv2+
 Group: Application/System
 
 %description audit
@@ -107,109 +105,8 @@ of the system. Currently storage and filesystem commands are audited.
 %{_mandir}/man8/sos-audit.sh.8.gz
 %ghost /etc/audit/rules.d/40-sos-filesystem.rules
 %ghost /etc/audit/rules.d/40-sos-storage.rules
-%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
-
-* Thu Jan 22 2026 Jan Jansky <jjansky@redhat.com> = 4.10.2-1
-- Update to 4.10.2-1
-  Resolves: RHEL-142630
-
-* Fri Dec 05 2025 Jan Jansky <jjansky@redhat.com> = 4.10.1-2
-- Fixing sosreport and sos-collector binary
-  Resolves: RHEL-121468
-
-* Tue Nov 25 2025 Jan Jansky <jjansky@redhat.com> = 4.10.1-1
-- Update to 4.10.1-1
-  Resolves: RHEL-121468
-
-* Tue Sep 23 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-4
-- Update to 4.10.0-4
-  Resolves: RHEL-112413
-
-* Wed Sep 17 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-2
-- Update to 4.10.0-2
-  Resolves: RHEL-112413
-
-* Thu Aug 21 2025 Jan Jansky <jjansky@redhat.com> = 4.10.0-1
-- Update to 4.10.0
-  Resolves: RHEL-110499
-
-* Fri Jul 04 2025 Jan Jansky <jjansky@redhat.com> = 4.9.2-1
-- Update to 4.9.2 in RHEL 8
-  Resolves: RHEL-101716
-
-* Fri May 30 2025 Jan Jansky <jjansky@redhat.com> = 4.9.1-2
-- Update to 4.9.1-2 in RHEL 8
-  Resolves: RHEL-86645
-
-* Tue Apr 15 2025 Jan Jansky <jjansky@redhat.com> = 4.9.1-1
-- Update to 4.9.1 in RHEL 8
-  Resolves: RHEL-86645
-
-* Tue Jan 07 2025 Jan Jansky <jjansky@redhat.com> = 4.8.2-1
-- Update to 4.8.2 in RHEL 8
-  Resolves: RHEL-72941
-
-* Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1
-- Update to 4.8.1 in RHEL 8
-  Resolves: RHEL-64160
-
-* Fri Sep 27 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-3
-- Added credentials obfuscation from multiple files
-  Resolves: RHEL-58097
-
-* Sat Sep 14 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-2
-- Resolves: RHEL-22732
-  Fix wrong formatting
-
-* Mon Sep 09 2024 Pierguido Lambri <plambri@redhat.com> = 4.8.0-1
-- New upstream release
-  Resolves: RHEL-58097
-
-* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-2
-- reverting RHEL-22732 patch due to regressions
-  Resolves: RHEL-49779
-
-* Fri Jun 21 2024 Pierguido Lambri <plambri@redhat.com> = 4.7.2-1
-- New upstream release
-  Resolves: RHEL-40871
-  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
-  Resolves: RHEL-35945
-
-* Mon Apr 08 2024 Jan Jansky <jjansky@redhat.com> = 4.7.1-1
-- rebase to upstream 4.7.1
-  Resolves: RHEL-32104
-
-* Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
-- rebase to upstream 4.7.0
-  Resolves: RHEL-26111
-
-* Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
-- rebase to upstream 4.6.1
-  Resolves: RHEL-21173
-- [redhat] Change authentication method for RHEL
-  Resolves: RHEL-21177
-
-* Wed Oct 18 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-5
-  [pulpcore] Scrub AUTH_LDAP_BIND_PASSWORD value
-  Resolves: RHEL-13697
-
-* 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
-
 * Fri Sep 01 2023 Pavel Moravec <pmoravec@redhat.com> = 4.6.0-2
 - [openshift_ovn] Collect additional ovnkube node logs
   Resolves: SUPDEV145