.gitignore

@@ -1,2 +1,2 @@
-SOURCES/sos-4.8.1.tar.gz
+SOURCES/sos-4.5.6.tar.gz
 SOURCES/sos-audit-0.3.tgz

.sos.metadata

@@ -1,2 +1,2 @@
-26aee6ec0ad73c12a4ad0cf50c02082777d654cc SOURCES/sos-4.8.1.tar.gz
+8f38e24add48538585441452d85e2ea4faa04c34 SOURCES/sos-4.5.6.tar.gz
 9d478b9f0085da9178af103078bbf2fd77b0175a SOURCES/sos-audit-0.3.tgz

SOURCES/sos-bz2226682-ovn-ic-db-files.patch

@@ -0,0 +1,42 @@
+From 0af74a8b24ec9dab0ca0089d5b834ab9908173ac Mon Sep 17 00:00:00 2001
+From: Periyasamy Palanisamy <pepalani@redhat.com>
+Date: Fri, 21 Jul 2023 15:03:01 +0530
+Subject: [PATCH] Collect db files for ovn interconnect environment
+
+This updates openshift_ovn plugin to collect ovn db files
+when it is running with interconnect configuration.
+
+Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
+---
+ sos/report/plugins/openshift_ovn.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py
+index 98522b1ed6..d81fc97aae 100644
+--- a/sos/report/plugins/openshift_ovn.py
++++ b/sos/report/plugins/openshift_ovn.py
+@@ -27,7 +27,13 @@ def setup(self):
+             "/var/log/openvswitch/libreswan.log",
+             "/var/log/openvswitch/ovs-monitor-ipsec.log"
+         ])
++        # 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"
++        ])
+ 
++        # The ovn cluster/status is not valid anymore for interconnect setup.
+         self.add_cmd_output([
+             'ovn-appctl -t /var/run/ovn/ovnnb_db.ctl ' +
+             'cluster/status OVN_Northbound',
+@@ -38,6 +44,10 @@ def setup(self):
+             'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +
+             'ct-zone-list'],
+             container='ovnkube-node')
++        # 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 ' +
++            'ct-zone-list'])
+         self.add_cmd_output([
+             'ovs-appctl -t ovs-monitor-ipsec tunnels/show',
+             'ipsec status',

SPECS/sos.spec

@@ -4,7 +4,7 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 4.8.1
+Version: 4.5.6
 Release: 1%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
@@ -22,6 +22,7 @@ Recommends: python3-pexpect
 Recommends: python3-pyyaml
 Conflicts: vdsm < 4.40
 Obsoletes: sos-collector <= 1.9
+Patch1: sos-bz2226682-ovn-ic-db-files.patch
 
 %description
 Sos is a set of tools that gathers information about system
@@ -32,6 +33,7 @@ support technicians and developers.
 %prep
 %setup -qn %{name}-%{version}
 %setup -T -D -a1 -q
+%patch1 -p1
 
 %build
 %py3_build
@@ -104,80 +106,6 @@ of the system.  Currently storage and filesystem commands are audited.
 
 
 %changelog
-* Wed Oct 23 2024 Jan Jansky <jjansky@redhat.com> = 4.8.1-1
-- Update to 4.8.1 in RHEL 9
-  Resolves: RHEL-64159
- 
-* 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-58096
-
-* Wed Sep 25 2024 Jan Jansky <jjansky@redhat.com> = 4.8.0-3
-- Update 4.8.0
-  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-58096
-
-* Wed Aug 21 2024 Pavel Moravec <pmoravec@redhat.com> = 4.7.2-3
-- reverting RHEL-22732 patch due to regressions
-  Resolves: RHEL-49781
-
-* Fri Jun 21 2024 Pierguido Lambri <plambri@redhat.com> = 4.7.2-1
-- New upstream release
-  Resolves: RHEL-49781
-
-* 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-32106
-
-* Tue Feb 20 2024 Jan Jansky <jjansky@redhat.com> = 4.7.0-1
-- rebase to upstream 4.7.0
-  Resolves: RHEL-26115
-
-* Thu Jan 11 2024 Pavel Moravec <pmoravec@redhat.com> = 4.6.1-1
-- rebase to upstream 4.6.1
-  Resolves: RHEL-21174
-- [redhat] Change authentication method for RHEL
-  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-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-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: bz2217906
-- [discovery] Enable the plugin by containers
-  Resolves: bz2222134
-
 * Thu Jul 27 2023 Pavel Moravec <pmoravec@redhat.com> = 4.5.6-1
 - Collect db files for ovn interconnect environment
   Resolves: bz2226682
@@ -440,7 +368,8 @@ of the system.  Currently storage and filesystem commands are audited.
 * 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
+  Resolves: bz1925419 
 
 * Wed Mar 10 2021 Sandro Bonazzola <sbonazzo@redhat.com> - 4.1-1
 - Rebase to 4.1
+