.gitignore

@@ -1,2 +1,2 @@
-SOURCES/sos-4.7.2.tar.gz
+SOURCES/sos-4.5.1.tar.gz
 SOURCES/sos-audit-0.3.tgz

.sos.metadata

@@ -1,2 +1,2 @@
-e01a25f05322cf56b75e07b5102dd61dbd4f0869 SOURCES/sos-4.7.2.tar.gz
+918b69741255038a99d969cc8b4ceecb7e18034f SOURCES/sos-4.5.1.tar.gz
 9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz

SOURCES/sos-RHEL-22732-reverted.patch

@@ -1,77 +0,0 @@
-From 11879fbb1adc33d8abc0cb70dc63e7e88c39fc3f Mon Sep 17 00:00:00 2001
-From: Jose Castillo <jcastillo@redhat.com>
-Date: Wed, 21 Feb 2024 12:24:37 +0000
-Subject: [PATCH] [redhat|policy] Check for archive size before upload
-
-The Red Hat Customer Portal has a max limit for
-single http requests of 1Gb. From sos side, we never checked this
-and so customers had to wait for the whole upload to be attempted
-before receiving an error from the portal.
-This patch attempts to stop the upload before it starts, informing
-customers of such limit, and switching to secure FTP where there's
-no limit.
-
-Related: RHEL-22732
-
-Signed-off-by: Jose Castillo <jcastillo@redhat.com>
----
- sos/policies/distros/redhat.py | 29 +++++++++++++++++++++++------
- 1 file changed, 23 insertions(+), 6 deletions(-)
-
-diff --git a/sos/policies/distros/redhat.py b/sos/policies/distros/redhat.py
-index edea151e2..2fb0df3fa 100644
---- a/sos/policies/distros/redhat.py
-+++ b/sos/policies/distros/redhat.py
-@@ -22,7 +22,7 @@
- from sos.policies.package_managers.rpm import RpmPackageManager
- from sos.policies.package_managers.flatpak import FlatpakPackageManager
- from sos.policies.package_managers import MultiPackageManager
--from sos.utilities import bold
-+from sos.utilities import bold, convert_bytes
- from sos import _sos as _
- 
- try:
-@@ -232,6 +232,8 @@ class RHELPolicy(RedHatPolicy):
-     _upload_url = RH_SFTP_HOST
-     _upload_method = 'post'
-     _device_token = None
-+    # Max size for an http single request is 1Gb
-+    _max_size_request = 1073741824
- 
-     def __init__(self, sysroot=None, init=None, probe_runtime=True,
-                  remote_exec=None):
-@@ -429,15 +429,30 @@ support representative.
-             return super().upload_sftp(user=_user, password=_token)
-         raise Exception("Could not retrieve valid or anonymous credentials")
- 
-+    def check_file_too_big(self, archive):
-+        size = os.path.getsize(archive)
-+        # Lets check if the size is bigger than the limit.
-+        # There's really no need to transform the size to Gb,
-+        # so we don't need to call any size converter implemented
-+        # in tools.py
-+        if (size >= self._max_size_request):
-+            self.ui_log.warning(
-+                _("Size of archive is bigger than Red Hat Customer Portal "
-+                  "limit for uploads of "
-+                  f"{convert_bytes(self._max_size_request)} "
-+                  " via sos http upload. \n")
-+                  )
-+            return RH_SFTP_HOST
-+        else:
-+            return RH_API_HOST
-+
-     def upload_archive(self, archive):
-         """Override the base upload_archive to provide for automatic failover
-         from RHCP failures to the public RH dropbox
-         """
-         try:
--            if self.upload_url and self.upload_url.startswith(RH_API_HOST) and\
--                    (not self.get_upload_user() or
--                     not self.get_upload_password()):
--                self.upload_url = RH_SFTP_HOST
-+            if self.get_upload_url().startswith(RH_API_HOST):
-+                self.upload_url = self.check_file_too_big(archive)
-             uploaded = super().upload_archive(archive)
-         except Exception as e:
-             uploaded = False

SOURCES/sos-bz2175650-microshift-plugin-oc-command.patch

@@ -0,0 +1,46 @@
+From ff5e73b29b1fcc4c5531654d4f67f808408aa989 Mon Sep 17 00:00:00 2001
+From: Pablo Acevedo Montserrat <pacevedo@redhat.com>
+Date: Thu, 2 Mar 2023 12:12:06 +0100
+Subject: [PATCH] [microshift] Fix microshift get and add commands
+
+Drop microshift get usage in favor of oc get commands.
+Add version and show-config commands before running inspect.
+
+Closes https://issues.redhat.com/browse/USHIFT-932
+
+Signed-off-by: Pablo Acevedo Montserrat <pacevedo@redhat.com>
+---
+ sos/report/plugins/microshift.py | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/sos/report/plugins/microshift.py b/sos/report/plugins/microshift.py
+index 953eb88e..69981d63 100644
+--- a/sos/report/plugins/microshift.py
++++ b/sos/report/plugins/microshift.py
+@@ -86,9 +86,10 @@ class Microshift(Plugin, RedHatPlugin):
+ 
+     def _get_namespaces(self):
+         res = self.exec_cmd(
+-            'microshift get namespaces'
++            'oc get namespaces'
+             ' -o custom-columns=NAME:.metadata.name'
+-            ' --no-headers')
++            ' --no-headers'
++            ' --kubeconfig=%s' % self.get_option('kubeconfig'))
+         if res['status'] == 0:
+             return self._reduce_namespace_list(res['output'].split('\n'))
+         return []
+@@ -146,6 +147,10 @@ class Microshift(Plugin, RedHatPlugin):
+         which is used to retrieve all API resources from the cluster.
+         """
+         self.add_forbidden_path('/var/lib/microshift')
++        self.add_cmd_output([
++            'microshift version',
++            'microshift show-config -m effective'
++        ])
+ 
+         _cluster_resources_to_collect = ",".join(
+             self._get_cluster_resources())
+-- 
+2.39.2
+

SOURCES/sos-bz2176086-iprconfig-sg-kmod.patch

@@ -0,0 +1,56 @@
+From e8dc0e55988b36d0476bcae741652208356f0f07 Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Tue, 7 Mar 2023 10:10:33 +0100
+Subject: [PATCH] [iprconfig] guard whole plugin by sg kmod predicate
+
+Calling any iprconfig command loads 'sg' kernel module. So guard
+collecting anything from the plugin by that kmod predicate.
+
+Resolves: #3159
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ sos/report/plugins/iprconfig.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/sos/report/plugins/iprconfig.py b/sos/report/plugins/iprconfig.py
+index 6b4fb895..a304107f 100644
+--- a/sos/report/plugins/iprconfig.py
++++ b/sos/report/plugins/iprconfig.py
+@@ -9,7 +9,7 @@
+ # This plugin enables collection of logs for Power systems
+ 
+ import re
+-from sos.report.plugins import Plugin, IndependentPlugin
++from sos.report.plugins import Plugin, IndependentPlugin, SoSPredicate
+ 
+ 
+ class IprConfig(Plugin, IndependentPlugin):
+@@ -22,6 +22,13 @@ class IprConfig(Plugin, IndependentPlugin):
+ 
+     def setup(self):
+ 
++        show_ioas = self.collect_cmd_output(
++                "iprconfig -c show-ioas",
++                pred=SoSPredicate(self, kmods=['sg'])
++        )
++        if not show_ioas['status'] == 0:
++            return
++
+         self.add_cmd_output([
+             "iprconfig -c show-config",
+             "iprconfig -c show-alt-config",
+@@ -35,10 +42,6 @@ class IprConfig(Plugin, IndependentPlugin):
+             "iprconfig -c dump"
+         ])
+ 
+-        show_ioas = self.collect_cmd_output("iprconfig -c show-ioas")
+-        if not show_ioas['status'] == 0:
+-            return
+-
+         devices = []
+         if show_ioas['output']:
+             p = re.compile('sg')
+-- 
+2.39.2
+

SOURCES/sos-bz2176218-sos-clean-tmp.patch

@@ -0,0 +1,85 @@
+From d4d4d5509fe4f0e29260b33a1c51bf62297ef0b9 Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Tue, 7 Mar 2023 13:16:02 +0100
+Subject: [PATCH 1/2] [cleaner] dont clean sys_tmp from final_path
+
+When generating location of final tarball, apply cleaner obfuscation to
+the filename but not to the tmp path itself. Otherwise
+
+sos clean --keywords tmp
+
+fails in attempt to move file to nonexisting /var/obfuscatedword0
+directory.
+
+Resolves: #3160
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ sos/cleaner/__init__.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/sos/cleaner/__init__.py b/sos/cleaner/__init__.py
+index d3e32992..b8e4aafd 100644
+--- a/sos/cleaner/__init__.py
++++ b/sos/cleaner/__init__.py
+@@ -400,8 +400,9 @@ third party.
+                     cf.write(checksum)
+             self.write_cleaner_log()
+ 
+-        final_path = self.obfuscate_string(
+-            os.path.join(self.sys_tmp, arc_path.split('/')[-1])
++        final_path = os.path.join(
++            self.sys_tmp,
++            self.obfuscate_string(arc_path.split('/')[-1])
+         )
+         shutil.move(arc_path, final_path)
+         arcstat = os.stat(final_path)
+-- 
+2.39.2
+
+
+From 622a26ee2faff91df03532892ca386c39e36a5fe Mon Sep 17 00:00:00 2001
+From: Pavel Moravec <pmoravec@redhat.com>
+Date: Tue, 7 Mar 2023 17:55:19 +0100
+Subject: [PATCH 2/2] [tests] add a test covering #3160
+
+Run the cleaner tests with obfuscating (also) "tmp" to cover files
+handling under sys_tmp.
+
+Related to: #3160
+
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ tests/cleaner_tests/existing_archive.py | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/tests/cleaner_tests/existing_archive.py b/tests/cleaner_tests/existing_archive.py
+index e13d1cae..7f31f88e 100644
+--- a/tests/cleaner_tests/existing_archive.py
++++ b/tests/cleaner_tests/existing_archive.py
+@@ -89,3 +89,22 @@ class ExistingArchiveCleanTest(StageTwoReportTest):
+         """Ensure that the 'testuser1' user created at install is obfuscated
+         """
+         self.assertFileNotHasContent('var/log/anaconda/journal.log', 'testuser1')
++
++class ExistingArchiveCleanTmpTest(StageTwoReportTest):
++    """Continuation of above tests which requires cleaning var / tmp keywords
++
++    Note that this copies heavily from the full_report_run test.
++
++    :avocado: tags=stagetwo
++    """
++
++    sos_cmd = '-v --keywords var,tmp,avocado --disable-parsers ip,ipv6,mac,username \
++        --no-update tests/test_data/%s.tar.xz' % ARCHIVE
++    sos_component = 'clean'
++
++    def test_sys_tmp_not_obfuscated(self):
++        """ Ensure that keywords var, tmp and avocado remains in the final archive
++        path despite they are parts of the --tmp-dir
++        """
++        self.assertTrue(self.archive.startswith(os.getenv('AVOCADO_TESTS_COMMON_TMPDIR')))
++
+-- 
+2.39.2
+

SPECS/sos.spec

@@ -4,25 +4,30 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.7.2
-Release: 2%{?dist}
+Version: 4.5.1
+Release: 3%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
-License: GPL-2.0-or-later
+License: GPLv2+
 BuildArch: noarch
 Url: https://github.com/sosreport/sos
 BuildRequires: python3-devel
 BuildRequires: gettext
 BuildRequires: python3-setuptools
+Requires: tar
+Requires: bzip2
+Requires: xz
 Requires: python3-requests
-Requires: python3-setuptools
 Recommends: python3-magic
 Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
-Obsoletes: sos-collector
-Patch0: sos-RHEL-22732-reverted.patch
+Obsoletes: sos-collector <= 1.9
+Patch1: sos-bz2175650-microshift-plugin-oc-command.patch
+Patch2: sos-bz2176086-iprconfig-sg-kmod.patch
+Patch3: sos-bz2176218-sos-clean-tmp.patch
+
 
 %description
 Sos is a set of tools that gathers information about system
@@ -33,7 +38,9 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
-%patch0 -p1 -R
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -41,11 +48,15 @@ support technicians and developers.
 
 %install
 %py3_install '--install-scripts=%{_sbindir}'
-rm -f %{buildroot}/usr/config/sos.conf
-rm -f %{buildroot}/usr/config/tmpfilesd-sos-rh.conf
-install -Dm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
-install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
-install -m 644 tmpfiles/tmpfilesd-sos-rh.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+
+install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+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 -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+
+rm -rf %{buildroot}/usr/config/
 
 %find_lang %{name} || echo 0
 
@@ -53,33 +64,25 @@ 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}/sosreport
 %{_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
 %{python3_sitelib}/*
-%{_mandir}/man1/sosreport.1.gz
-%{_mandir}/man1/sos-clean.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
-%{_mandir}/man1/sos.1.gz
+%{_mandir}/man1/*
 %{_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: GPLv2+
@@ -89,7 +92,7 @@ Group: Application/System
 
 Sos-audit provides configuration files for the Linux Auditing System
 to track the use of some commands capable of changing the configuration
-of the system. Currently storage and filesystem commands are audited.
+of the system.  Currently storage and filesystem commands are audited.
 
 %post audit
 %{_sbindir}/sos-audit.sh
@@ -106,417 +109,242 @@ of the system. Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-filesystem.rules
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
+
 %changelog
-* 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
-
-* Wed Aug 23 2023 Jan Jansky <jjansky@redhat.com> = 4.6.0-1
-- [cleaner] Use data filter for extraction
-  Resolves: bz2218873
-
-* Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
-- Rebase sos to 4.5.6
-  Resolves: bz2226724
-
-* Fri Jul 14 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-2
-- Adding patch for mac obfuscation
-  Resolves: bz2218279
-  Resolves: bz2216608
-  Resolves: bz2207562
-
-* Mon Jul 03 2023 Jan Jansky <jjansky@redhat.com> = 4.5.5-1
-- [clean] Respect permissions of sanitised files
-  Resolves: bz2218279
-- [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
-- [plugins] collect strings before commands
-  Resolves: bz2203141
-- [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
-- [report] Ignore case when scrubbing via do_file_sub
-  Resolves: bz2143272
-- [subscription_manager] Scrub proxy passwords from repo_server_val
-  Resolves: bz2177282
-- [virsh] Scrub passwords in virt-manager logs
-  Resolves: bz2184062
-
-* Wed Mar 08 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
+* Mon Mar 06 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.1-3
 - Rebase on upstream 4.5.1
-  Resolves: bz2175806
-- [composer] Capure /etc/osbuild-composer file
-  Resolves: bz2169776
-- [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
+  Resolves: bz2175808
+- [microshift] Fix microshift get and add commands
+  Resolves: bz2175650
 
-* Tue Feb 07 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
+* Thu Feb 02 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.0-1
 - Rebase on upstream 4.5.0
-  Resolves: bz2082614
+  Resolves: bz2166621
+- [report] Prevent obfuscating tmpDir path before tarbal move
+  Resolves: bz2166582
+- [collector] Prevent appending local host in strict_node_list mode
+  Resolves: bz2166583
+- [policies] set case_id before prompting for upload credentials
+  Resolves: bz2166585
+- [ovn_central] Add support to OVN DBs clustering and non-clustered
+  Resolves: bz2166584
 
-* Thu Nov 03 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-4
+* Mon Oct 03 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-5
+- [ovn_central] Rename container responsable of Red Hat
+  Resolves: bz2042966
+- [PATCH] [host] Skip entire /etc/sos/cleaner directory
+  Resolves: bz2023867
+
+* Thu Sep 29 2022 Pavel Moravec <pmoravec@redhat.com> = 4.3-4
 - [ocp] Add newly required labels to temp OCP namespace
-  Resolves: bz2130922
-
-* Fri Oct 28 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-3
-- [cleaner] Apply compile_regexes after a regular parse line
-  Resolves: bz2138173
-
-* Thu Sep 22 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-2
-- [utilities] Relax from hard dependency of python3-magic
-  Resolves: bz2129038
-- [dnf] Collect legacy yum config symlinks, properly obfuscate pwds
-  Resolves: bz2100154
-
-* Fri Sep 09 2022 Pavel Moravec <pmoravec@redhat.com> = 4.4-1
-- Rebase on upstream 4.4
-  Resolves: bz2082614
-- [redhat] Honour credential-less --upload-url on RedHat distro properly
-  Resolves: bz2059572
-- [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
-- [cleaner] Use compiled regex lists for parsers by default
-  Resolves: bz2043233
-- [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
+  Resolves: bz2130209
 
 * 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
-  Resolves: bz2095263
-- [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
+- [ocp, openshift] Re-align API collection options and rename
+  Resolves: bz2065563
 - [utilities] Close file only when storing to file
-  Resolves: bz2079486
-- [presets] Adjust OCP preset options, more OCP backports
-  Resolves: bz2058279
+  Resolves: bz2079492
+- [report] --list-plugins should report used, not default,
+  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
-- [vdsm] Exclude /var/lib/vdsm/storage/transient_disks
-  Resolves: bz2029154
+  Resolves: 2065558
+- [system] Collect glibc tuning decisions
+  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
-- [options] allow variant option names in config file
-  Resolves: bz1923938
-- [plugins] Set default predicate instead of None
-  Resolves: bz1985986
-- [MigrationResults] collect info about conversions
-  Resolves: bz1959598
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Mon Jun 21 2021 Pavel Moravec <pmoravec@redhat.com> = 4.1-3
-- [gluster] collect public keys from the right dir
-  Resolves: bz1925419
-- [cleaner] Only skip packaging-based files for the IP parse
-  Resolves: bz1964499
+* Tue Jul 27 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-6
 - [networking] collect also tc filter show ingress
-  Resolves: bz1886711
-- [archive] skip copying SELinux context for /proc and /sys
-  Resolves: bz1965001
+  Resolves: bz1985976
+- [cleaner] Only skip packaging-based files for the IP parser
+  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
-- Rebase on upstream 4.1
-  Resolves: bz1928679
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.1-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Tue Feb 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-8
-- Automatically create directory for sos-cleaner default_mapping
-  Resolves: bz1923937
+* Thu Apr 01 2021 Pavel Moravec <pmoravec@redhat.com> - 4.1-3
+- adding sos-audit
+- [gluster] Add glusterd public keys and status files
+  Resolves: bz1925419 
 
-* Fri Jan 29 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-7
-- [kdump] Gather the file kexec-dmesg.log
-  Resolves: bz1887402
-- [Policy] Handle additional FTP authentication issues
-  Resolves: bz1916729
+* Wed Mar 10 2021 Sandro Bonazzola <sbonazzo@redhat.com> - 4.1-1
+- Rebase to 4.1
 
-* 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